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 57538 - in incubator/derby/code/trunk/java/engine/org/apache/derby: authentication catalog catalog/types database diag iapi impl/db impl/io impl/jdbc impl/jdbc/authentication impl/load impl/services/bytecode impl/services/cache impl/services/daemon impl/services/jce impl/services/locks impl/services/monitor impl/services/reflect impl/services/stream impl/services/uuid impl/sql impl/sql/catalog impl/sql/compile impl/sql/conn impl/sql/depend impl/sql/execute impl/sql/execute/rts impl/store/access impl/store/access/btree impl/store/access/btree/index impl/store/access/conglomerate impl/store/access/heap impl/store/access/sort impl/store/raw impl/store/raw/data impl/store/raw/log impl/store/raw/xact io jdbc osgi vti
Date Fri, 12 Nov 2004 19:38:17 GMT
Author: djd
Date: Fri Nov 12 11:38:07 2004
New Revision: 57538

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Node.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/Scan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/RawStore.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocationCache.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ByteHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageActions.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RFResource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RawField.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RecordId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/Scan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/StorageRandomAccessFile.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/io/WritableStorageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver169.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver20.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/Driver30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XAStatementControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/XATransactionState.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
   incubator/derby/code/trunk/java/engine/org/apache/derby/osgi/EmbeddedActivator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IFastPath.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/IQualifyable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/Pushable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTICosting.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIEnvironment.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/vti/VTITemplate.java
Log:
Update file header to ASF copyright and Apache Licence notice - java/engine/org/apache/derby/impl files.


Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/authentication/UserAuthenticator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.authentication.UserAuthenticator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/AliasInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.AliasInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DefaultInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.DefaultInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Dependable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.Dependable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/DependableFinder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.DependableFinder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.GetProcedureColumns
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/IndexDescriptor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.IndexDescriptor
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/ReferencedColumns.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.ReferencedColumns
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/Statistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.Statistics
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.SystemProcedures
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.TriggerNewTransitionRows
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.TriggerOldTransitionRows
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/TypeDescriptor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.TypeDescriptor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/UUID.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.UUID
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.BaseTypeIdImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.DecimalTypeIdImpl
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.DefaultInfoImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.IndexDescriptorImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.MethodAliasInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.ReferencedColumnsDescriptorImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.RoutineAliasInfo
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/StatisticsImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.StatisticsImpl
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.TypeDescriptorImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.TypesImplInstanceGetter
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.catalog.types.UserDefinedTypeIdImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/database/Database.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.database
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.database.Database
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/database/UserUtility.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.database
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.database.UserUtility
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.ErrorLogReader
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorMessages.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.ErrorMessages
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.LockTable
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/SpaceTable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.SpaceTable
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementCache.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.StatementCache
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/StatementDuration.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.StatementDuration
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/diag/TransactionTable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.diag.TransactionTable
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/build.xml	Fri Nov 12 11:38:07 2004
@@ -19,7 +19,14 @@
 <!-- Targets -->
   <target name="iapi" depends="compile_iapi_error"/>
 
-  <target name="compile_iapi_error">
+  <target name="compile_iapi_error" depends="compile_iapi_error_jsr169" >
+    <ant dir="${derby.engine.dir}/iapi/services"/>
+    <ant dir="${derby.engine.dir}/iapi/store"/>
+    <ant dir="${derby.engine.dir}/iapi/sql"/>
+    <ant dir="${derby.engine.dir}/iapi/jdbc"/>
+  </target>
+
+  <target name="compile_iapi_error_jsr169">
     <ant dir="${derby.engine.dir}/iapi/reference"/>
     <javac
       bootclasspath="${empty}"
@@ -38,13 +45,12 @@
       <include name="${derby.dir}/iapi/error/**"/>
     </javac>
     <ant dir="${derby.engine.dir}/iapi/util"/>
-    <ant dir="${derby.engine.dir}/iapi/services"/>
+    <ant dir="${derby.engine.dir}/iapi/services" target="compile_iapi_services_jsr169" />
     <ant dir="${derby.engine.dir}/iapi/types" />
-    <ant dir="${derby.engine.dir}/iapi/store"/>
-    <ant dir="${derby.engine.dir}/iapi/sql"/>
+    <ant dir="${derby.engine.dir}/iapi/store" target="compile_iapi_store_jsr169"/>
+    <ant dir="${derby.engine.dir}/iapi/sql" target="compile_iapi_sql_jsr169" />
     <ant dir="${derby.engine.dir}/iapi/db"/>
-    <ant dir="${derby.engine.dir}/iapi/jdbc"/>
+    <ant dir="${derby.engine.dir}/iapi/jdbc" target="compile_iapi_jdbc_jsr169" />
   </target>
 
 </project>
-

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/BasicDatabase.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.db.BasicDatabase
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.db.DatabaseContextImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.db.StoreClassFactoryContext
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/BaseStorageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.BaseStorageFactory
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.CPFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/CPStorageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.CPStorageFactory
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirFile4.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirFile4
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirRandomAccessFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirRandomAccessFile4
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirStorageFactory
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/DirStorageFactory4.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.DirStorageFactory4
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/InputStreamFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.InputStreamFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarDBFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.JarDBFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/JarStorageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.JarStorageFactory
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.URLFile
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/io/URLStorageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.io.URLStorageFactory
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.BinaryToRawStream
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.ConnectionChild
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedBlob
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedCallableStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedCallableStatement20
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedCallableStatement30
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedClob.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedClob
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedConnection
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedConnection20
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedConnection30
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedConnectionContext
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedDatabaseMetaData
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedParameterMetaData30
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedParameterSetMetaData
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedPreparedStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedPreparedStatement20
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedPreparedStatement30
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedResultSet20
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedResultSetMetaData
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedSQLException
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedSQLWarning
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedSavepoint30
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.EmbedStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.RawToBinaryFormatStream
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.ReaderToAscii
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.ReaderToUTF8Stream
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.TransactionResourceImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.UTF8Reader
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/Util.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.Util
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.AuthenticationServiceBase
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.BasicAuthenticationServiceImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.JNDIAuthenticationSchemeBase
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.JNDIAuthenticationService
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.LDAPAuthenticationSchemeImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.NoneAuthenticationServiceImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.jdbc.authentication.SpecificAuthenticationServiceImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ColumnInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ColumnInfo
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ControlInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ControlInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Export.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.Export
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportAbstract.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ExportAbstract
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ExportResultSetForObject
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ExportWriteData
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ExportWriteDataAbstract
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.Import
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportAbstract.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ImportAbstract
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportReadData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ImportReadData
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.ImportResultSetMetaData
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.load.LoadError
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCClass.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCClass
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCExpr
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCJava
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCLocalField
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCMethod
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCMethodCaller
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCMethodDescriptor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.BCUnsupported
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.CodeChunk
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.Conditional
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/GClass.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.GClass
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.OpcodeDebug
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Type.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.Type
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.VMTypeIdCacheable
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.bytecode.d_BCValidate
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CacheStat.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.cache.CacheStat
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/CachedItem.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.cache.CachedItem
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/Clock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.cache.Clock
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/cache/ClockFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.cache.ClockFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.daemon.BasicDaemon
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.daemon.ServiceRecord
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.daemon.SingleThreadDaemonFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.jce
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.jce.JCECipherFactory
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.jce
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.jce.JCECipherProvider
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.ActiveLock
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Constants.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.Constants
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Control.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.Control
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.D_ActiveLock
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_Lock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.D_Lock
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/D_LockControl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.D_LockControl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.Deadlock
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Lock.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.Lock
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockControl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.LockControl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.LockSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSpace.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.LockSpace
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.LockTableVTI
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.SinglePool
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.TableNameInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Timeout.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.locks.Timeout
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.BaseMonitor
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.FileMonitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.ModuleInstance
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.PersistentServiceImpl
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.ProtocolKey
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.ReadOnly
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.ServiceBootContext
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/TopService.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.TopService
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.monitor.UpdateServiceProperties
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.DatabaseClasses
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.GCInstanceFactory
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFile.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.JarFile
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.JarFileJava2
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/JarLoader.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.JarLoader
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.LoadedGeneratedClass
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.ReflectClassesJava2
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.ReflectGeneratedClass
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.ReflectLoaderJava2
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.ReflectMethod
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.reflect.UpdateLoader
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.stream.BasicGetLogHeader
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.stream.BasicHeaderPrintWriter
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/SingleStream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.stream.SingleStream
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.uuid.BasicUUID
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.uuid.BasicUUIDFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.services.uuid.BasicUUIDGetter
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.CursorInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/CursorTableReference.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.CursorTableReference
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericActivationHolder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericClassInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericClassInfo
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericColumnDescriptor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericLanguageFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericParameter
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericParameterValueSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericPreparedStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericResultDescription.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericResultDescription
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.GenericStorablePreparedStatement
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.LanguageDbPropertySetter
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.CoreDDFinderClassInfo
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DDColumnDependableFinder
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DD_Version
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DDdependableFinder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DataDictionaryContextImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DataDictionaryImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.DropDependencyFilter
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.IndexInfoImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.IndexScan
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.NameTDCacheable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.OIDTDCacheable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SPSNameCacheable
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SYSDUMMY1RowFactory
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SYSFILESRowFactory
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SYSSTATEMENTSRowFactory
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SYSSTATISTICSRowFactory
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SYSTRIGGERSRowFactory
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java	Fri Nov 12 11:38:07 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 2000, 2001
+
+ * Copyright 2000, 2001WESTHAM
+
  *
  * The source code for this program is not published or otherwise divested
  * of its trade secrets, irrespective of what has been deposited with the

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.SystemColumnImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.TDCacheable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.TabInfoImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TableKey.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.catalog.TableKey
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AccessPathImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ActivationClassBuilder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AggregateDefinition
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AggregateNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AllResultColumn
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AlterSPSNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AlterTableNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AndNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.AndNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BaseColumnNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BaseJoinStrategy
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BaseTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BetweenOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryArithmeticOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryComparisonOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryListOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryLogicalOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BinaryRelationalOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BitConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BitTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BooleanConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.BooleanTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CLOBTypeCompiler
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.C_NodeNames
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CallStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CastNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CharConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharStream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CharStream
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CharTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CoalesceFunctionNode
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CollectNodesVisitor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ColumnDefinitionNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ColumnOrdering
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ColumnReference
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CompilerContextImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ConcatenationOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ConditionalNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ConstraintDefinitionNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CostEstimateImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CountAggregateDefinition
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateAliasNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateIndexNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateSchemaNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateTableNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateTriggerNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CreateViewNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CurrentDatetimeOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CurrentIsolationNode
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CurrentOfNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CurrentRowLocationNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CurrentUserNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.CursorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DB2LengthOperatorNode
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DDLStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DMLModStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DMLStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DateTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DefaultNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DefaultVTIModDeferPolicy
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DeleteNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DistinctNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropAliasNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropIndexNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropSPSNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropSchemaNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropTableNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropTriggerNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.DropViewNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ExecSPSNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ExpressionClassBuilder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ExtractOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FKConstraintDefinitionNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FromBaseTable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FromList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FromSubquery
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FromTable
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.FromVTI
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.GetCurrentConnectionNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.GroupByColumn
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.GroupByList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.GroupByNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HalfOuterJoinNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HasCorrelatedCRsVisitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HasNodeVisitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HasVariantValueNodeVisitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HashJoinStrategy
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HashNodeList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.HashTableNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.InListOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.IndexToBaseRowNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.InsertNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.IsNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.IsNullNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.JavaToSQLValueNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.JavaValueNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.JoinNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.LOBConstantNode
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.LOBTypeCompiler
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.LengthOperatorNode
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.Level2CostEstimateImpl
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.Level2OptimizerFactoryImpl
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.Level2OptimizerImpl
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.LikeEscapeOperatorNode
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.LockTableNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.MaterializeResultSetNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.MaterializeSubqueryNode
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.MaxMinAggregateDefinition
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.MethodCallNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.MiscellaneousStatementNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ModifyColumnNode
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NOPStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NestedLoopJoinStrategy
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NewInvocationNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NodeFactoryImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NonStaticMethodCallNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NormalizeResultSetNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NotNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NumericConstantNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.NumericTypeCompiler
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OptimizerFactoryImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OptimizerImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrderByColumn
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrderByList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrderByNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrderedColumn
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.OrderedColumnList
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ParameterNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParseException.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ParseException
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ParserImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.Predicate
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.PredicateList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ProjectRestrictNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.QuantifiedBinaryOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.QuantifiedUnaryOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.QueryTreeNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.QueryTreeNodeVector
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ReadCursorNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RefTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ReferencedTablesVisitor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RelationalOperator
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RemapCRsVisitor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RenameNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RenameNode
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ReplaceAggregatesWithCRVisitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ResultColumn
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ResultColumnList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ResultSetNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RowOrderingImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.RowResultSetNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SQLBooleanConstantNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SQLToJavaValueNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SavepointNode
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ScrollInsensitiveResultSetNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SelectNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
                      

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SetSchemaNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SetTransactionIsolationNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SimpleStringOperatorNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SingleChildResultSetNode
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.StatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.StaticClassFieldReferenceNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.StaticMethodCallNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.StringSlicer
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SubqueryList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SubqueryNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.SumAvgAggregateDefinition
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TableElementList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TableElementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TableName
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TableOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TernaryOperatorNode
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TestConstraintNode
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TimeTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TimestampOperatorNode
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TimestampTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Token.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.Token
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TransactionStatementNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TriggerReferencingStruct
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.TypeCompilerFactoryImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UCode_CharStream
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UnaryArithmeticOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UnaryComparisonOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UnaryLogicalOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UnaryOperatorNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UnionNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UntypedNullConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UpdateNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UserDefinedTypeCompiler
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.UserTypeConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.VTIDeferModPolicy
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ValueNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.ValueNodeList
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.VarbitConstantNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.VerifyAggregateExpressionsVisitor
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.compile.VirtualColumnNode
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj	Fri Nov 12 11:38:07 2004
@@ -16,16 +16,26 @@
 }
 
 PARSER_BEGIN(SQLParser)
-/* IBM Confidential
- *
- * Product ID: 5697-F53
- *
- * (C) Copyright IBM Corp. 2003, 2004.
- *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
- */
+
+/*
+
+   Derby - File org.apache.derby.impl.sql.compile.sqlgrammar.jj
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
 
 package org.apache.derby.impl.sql.compile;
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.CachedStatement
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.GenericAuthorizer
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.GenericLanguageConnectionFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.GenericStatementContext
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.conn.TempTableInfo
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.depend.BasicDependency
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.depend.BasicDependencyManager
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.depend.BasicProviderInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.depend.DepClassInfo
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AddJarConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AggregateSortObserver
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AggregatorInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AggregatorInfoList
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AlterSPSConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AlterTableConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AnyResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AutoincrementCounter
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.AvgAggregator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.BaseActivation
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.BaseExpressionActivation
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.BasicNoPutResultSetImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.BasicSortObserver
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.BulkTableScanResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CallStatementResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CardinalityCounter
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ColumnInfo
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ConstantActionActivation
+
+   Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ConstraintConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ConstraintInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CountAggregator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateAliasConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateConstraintConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateIndexConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateSPSConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateSchemaConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateTableConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateTriggerConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CreateViewConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CurrentDatetime
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CurrentOfResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.CursorActivation
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DDLConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DDLSingleTableConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DMLVTIResultSet
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DMLWriteResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DeleteCascadeResultSet
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DeleteConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DeleteResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DeleteVTIResultSet
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DependentResultSet
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DistinctGroupedAggregateResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DistinctScalarAggregateResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DistinctScanResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropAliasConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropConstraintConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropIndexConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropJarConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropSPSConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropSchemaConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropStatisticsConstantAction
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropTableConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropTriggerConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.DropViewConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/FKInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.FKInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ForeignKeyRIChecker
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericAggregateResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericAggregator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericConstantActionFactory
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericExecutionContext
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericExecutionFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericQualifier
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericRIChecker
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericResultSetFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericSPSConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericScanQualifier
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GenericTriggerExecutor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.GroupedAggregateResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.HashJoinResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.HashLeftOuterJoinResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.HashScanResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.HashTableResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexChanger
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexColumnOrder
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexRowToBaseRowResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexSetChanger
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.IndexValueRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.InsertConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.InsertResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.InsertVTIResultSet
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.InternalTriggerExecutionContext
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarDDL.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.JarDDL
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.JarUtil
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.JoinResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.KeyToBaseRowConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.LastIndexKeyResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.LockTableConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.MaterializedResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.MaxMinAggregator
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.MergeJoinResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.MiscResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.NestedLoopJoinResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.NestedLoopLeftOuterJoinResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.NoPutResultSetImpl
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.NoRowsResultSetImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.NormalizeResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.OnceResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.OrderableAggregator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ProjectRestrictResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RIBulkChecker
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RISetChecker
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RealResultSetStatisticsFactory
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ReferencedKeyRIChecker
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RenameConstantAction
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ReplaceJarConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RowChangerImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RowResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RowTriggerExecutor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.RowUtil
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SavepointConstantAction
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ScalarAggregateResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ScrollInsensitiveResultSet
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SetConstraintsConstantAction
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SetSchemaConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SetTransactionIsolationConstantAction
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SetTransactionResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SortResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.StatementTriggerExecutor
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SumAggregator
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.SystemAggregator
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TableScanResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TemporaryRowHolderImpl
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TemporaryRowHolderResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TriggerEvent
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TriggerEventActivator
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TriggerEvents
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.TriggerInfo
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UnionResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UniqueIndexSortObserver
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UpdatableVTIConstantAction
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UpdateConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UpdateResultSet
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UpdateStatisticsConstantAction
+
+   Copyright 2001, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.UpdateVTIResultSet
+
+   Copyright 2003, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.VTIResultSet
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/ValueRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.ValueRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.WriteCursorConstantAction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealAnyResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealBasicNoPutResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealCurrentOfStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealDeleteCascadeResultSetStatistics
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealDeleteResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealDeleteVTIResultSetStatistics
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealDistinctScalarAggregateStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealDistinctScanStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealGroupedAggregateStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealHashJoinStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealHashLeftOuterJoinStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealHashScanStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealHashTableStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealIndexRowToBaseRowStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealInsertResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealInsertVTIResultSetStatistics
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealJoinResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealLastIndexKeyScanStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealMaterializedResultSetStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealNestedLoopJoinStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealNestedLoopLeftOuterJoinStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealNoPutResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealNoRowsResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealNormalizeResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealOnceResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealProjectRestrictStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealRowResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealScalarAggregateStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealScrollInsensitiveResultSetStatistics
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealSortStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealTableScanStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealUnionResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealUpdateResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RealVTIStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.ResultSetStatistics
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.sql.execute.rts.RunTimeStatisticsImpl
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.BackingStoreHashTableFromScan
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.CacheableConglomerate
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.PC_XenaVersion
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.PropertyConglomerate
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.RAMAccessManager
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.RAMTransaction
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.RAMTransactionContext
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.RllRAMAccessManager
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.StorableFormatId
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTF.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.UTF
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/UTFQualifier.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.UTFQualifier
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTree.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTree
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeController
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeCostController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeForwardScan
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeLockingPolicy
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeMaxScan
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreePostCommit
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeRowPosition
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeScan
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BTreeScanInfo
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BranchControlRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.BranchRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.ControlRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.D_BTreeController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.LeafControlRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.OpenBTree
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.SearchParameters
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/WaitError.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.WaitError
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2I
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IController
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2ICostController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IForwardScan
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IMaxScan
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2INoLocking
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IRowLocking1
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IRowLocking2
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IRowLocking3
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IRowLockingRR
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IStaticCompiledInfo
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2ITableLocking3
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.B2IUndo
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.btree.index.D_B2IController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.BinaryOrderableWrapper
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.ConglomerateUtil
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.GenericConglomerate
+
+   Copyright 2002, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.GenericConglomerateController
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.GenericController
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.GenericCostController
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.GenericScanController
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.OpenConglomerate
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.OpenConglomerateScratchSpace
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.QualifierUtil
+
+   Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.RowPosition
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.conglomerate.TemplateRow
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.D_HeapController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/Heap.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.Heap
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.HeapClassInfo
+
+   Copyright 2000, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.HeapConglomerateFactory
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.HeapController
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.HeapCostController
+
+   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
  */
 

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java	Fri Nov 12 11:38:07 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+   Derby - Class org.apache.derby.impl.store.access.heap.HeapPostCommit
+
+   Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+   Licensed under the Apache Licen