svn commit: rev 57535 - in incubator/derby/code/trunk/java/engine/org/apache/derby/iapi: db error jdbc reference services/cache services/classfile services/compiler services/context services/crypto services/daemon services/diag services/i18n services/info services/io services/loader services/locks services/monitor services/property services/sanity services/stream services/uuid sql sql/compile sql/conn sql/depend sql/dictionary sql/execute store/access store/access/conglomerate store/access/xa store/raw store/raw/data store/raw/log store/raw/xact types util

[dj...@apache.org]

Author: djd
Date: Fri Nov 12 09:26:08 2004
New Revision: 57535

Modified:
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ClassName.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DB2Limit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/EngineType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java
   incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
Log:
Update file header to ASF copyright and Apache Licence notice - java/engine/org/apache/derby/iapi files


Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConnectionInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.ConnectionInfo
+
+   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/iapi/db/ConsistencyChecker.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.db
-   (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.iapi.db.ConsistencyChecker
+
+   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/db/Database.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Database.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.Database
+
+   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/iapi/db/DatabaseContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/DatabaseContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.DatabaseContext
+
+   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/iapi/db/Factory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/Factory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.Factory
+
+   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/iapi/db/OptimizerTrace.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/OptimizerTrace.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.OptimizerTrace
+
+   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/iapi/db/PropertyInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/PropertyInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.db.PropertyInfo
+
+   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/iapi/db/TriggerExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.db
-   (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.iapi.db.TriggerExecutionContext
+
+   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/error/ExceptionSeverity.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.error
-   (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.iapi.error.ExceptionSeverity
+
+   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/iapi/error/PassThroughException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PassThroughException.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.error
-   (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.iapi.error.PassThroughException
+
+   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/iapi/error/PublicAPI.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/PublicAPI.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.error
-   (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.iapi.error.PublicAPI
+
+   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/error/StandardException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/error/StandardException.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.error
-   (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.iapi.error.StandardException
+
+   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/iapi/jdbc/AuthenticationService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.AuthenticationService
+
+   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/iapi/jdbc/BrokeredCallableStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredCallableStatement
+
+   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/iapi/jdbc/BrokeredCallableStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredCallableStatement30
+
+   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/iapi/jdbc/BrokeredConnection.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.BrokeredConnection
+
+   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/iapi/jdbc/BrokeredConnection30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.BrokeredConnection30
+
+   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/iapi/jdbc/BrokeredConnectionControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.BrokeredConnectionControl
+
+   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/iapi/jdbc/BrokeredPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredPreparedStatement
+
+   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/iapi/jdbc/BrokeredPreparedStatement30.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredPreparedStatement30
+
+   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/iapi/jdbc/BrokeredStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredStatement
+
+   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/iapi/jdbc/BrokeredStatementControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.BrokeredStatementControl
+
+   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/iapi/jdbc/ConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.ConnectionContext
+
+   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/iapi/jdbc/DRDAServerStarter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.jdbc
-   (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.iapi.jdbc.DRDAServerStarter
+
+   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/iapi/jdbc/JDBCBoot.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.JDBCBoot
+
+   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/iapi/jdbc/ResourceAdapter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.jdbc.ResourceAdapter
+
+   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/reference/Attribute.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.Attribute
+
+   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/reference/ClassName.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ClassName.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ClassName.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.ClassName
+
+   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/iapi/reference/ContextId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/ContextId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.ContextId
+
+   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/iapi/reference/DB2Limit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DB2Limit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/DB2Limit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.DB2Limit
+
+   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/iapi/reference/EngineType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/EngineType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/EngineType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.EngineType
+
+   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/iapi/reference/JDBC20Translation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.JDBC20Translation
+
+   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/reference/JDBC30Translation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.JDBC30Translation
+
+   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/iapi/reference/MessageId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/MessageId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.MessageId
+
+   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/iapi/reference/Module.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Module.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.Module
+
+   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/iapi/reference/Property.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.Property
+
+   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/iapi/reference/SQLState.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/SQLState.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.reference
-   (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.iapi.reference.SQLState
+
+   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/services/cache/CacheFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.cache.CacheFactory
+
+   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/iapi/services/cache/CacheManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.cache.CacheManager
+
+   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/iapi/services/cache/Cacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.cache.Cacheable
+
+   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/iapi/services/cache/CacheableFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.cache
-   (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.iapi.services.cache.CacheableFactory
+
+   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/iapi/services/cache/ClassSize.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.cache
-   (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.iapi.services.cache.ClassSize
+
+   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/iapi/services/cache/SizedCacheable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.cache
-   (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.iapi.services.cache.SizedCacheable
+
+   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/iapi/services/classfile/AttributeEntry.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.AttributeEntry
+
+   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/iapi/services/classfile/Attributes.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.Attributes
+
+   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/iapi/services/classfile/CONSTANT_Double_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Double_info
+
+   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/iapi/services/classfile/CONSTANT_Float_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Float_info
+
+   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/iapi/services/classfile/CONSTANT_Index_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Index_info
+
+   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/iapi/services/classfile/CONSTANT_Integer_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Integer_info
+
+   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/iapi/services/classfile/CONSTANT_Long_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Long_info
+
+   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/iapi/services/classfile/CONSTANT_Utf8_info.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.CONSTANT_Utf8_info
+
+   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/iapi/services/classfile/ClassEnumeration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassEnumeration
+
+   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/iapi/services/classfile/ClassFormatOutput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassFormatOutput
+
+   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/iapi/services/classfile/ClassHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassHolder
+
+   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/iapi/services/classfile/ClassInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassInput
+
+   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/iapi/services/classfile/ClassInvestigator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassInvestigator
+
+   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/iapi/services/classfile/ClassMember.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ClassMember
+
+   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/iapi/services/classfile/ConstantPoolEntry.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.ConstantPoolEntry
+
+   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/iapi/services/classfile/MemberTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.MemberTable
+
+   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/iapi/services/classfile/VMDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.VMDescriptor
+
+   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/iapi/services/classfile/VMOpcode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.classfile
-   (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.iapi.services.classfile.VMOpcode
+
+   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/iapi/services/compiler/ClassBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.compiler
-   (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.iapi.services.compiler.ClassBuilder
+
+   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/iapi/services/compiler/JavaFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.compiler
-   (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.iapi.services.compiler.JavaFactory
+
+   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/iapi/services/compiler/LocalField.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.compiler
-   (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.iapi.services.compiler.LocalField
+
+   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/iapi/services/compiler/MethodBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.compiler
-   (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.iapi.services.compiler.MethodBuilder
+
+   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/iapi/services/context/Context.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.Context
+
+   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/iapi/services/context/ContextImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.ContextImpl
+
+   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/services/context/ContextManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.ContextManager
+
+   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/iapi/services/context/ContextService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.ContextService
+
+   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/iapi/services/context/ErrorStringBuilder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.ErrorStringBuilder
+
+   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/iapi/services/context/ShutdownException.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.ShutdownException
+
+   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/iapi/services/context/SystemContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.context
-   (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.iapi.services.context.SystemContext
+
+   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/iapi/services/crypto/CipherFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.crypto
-   (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.iapi.services.crypto.CipherFactory
+
+   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/iapi/services/crypto/CipherProvider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.crypto
-   (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.iapi.services.crypto.CipherProvider
+
+   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/iapi/services/daemon/DaemonFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.daemon.DaemonFactory
+
+   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/iapi/services/daemon/DaemonService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.daemon.DaemonService
+
+   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/iapi/services/daemon/Serviceable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.daemon.Serviceable
+
+   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/iapi/services/diag/DiagnosticUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.diag
-   (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.iapi.services.diag.DiagnosticUtil
+
+   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/iapi/services/diag/Diagnosticable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.diag
-   (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.iapi.services.diag.Diagnosticable
+
+   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/iapi/services/diag/DiagnosticableGeneric.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.diag
-   (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.iapi.services.diag.DiagnosticableGeneric
+
+   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/iapi/services/diag/Performance.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.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.iapi.services.diag.Performance
+
+   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/services/i18n/BundleFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.i18n
-   (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.iapi.services.i18n.BundleFinder
+
+   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/iapi/services/i18n/LocaleFinder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.i18n
-   (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.iapi.services.i18n.LocaleFinder
+
+   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/iapi/services/i18n/MessageService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.i18n
-   (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.iapi.services.i18n.MessageService
+
+   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/iapi/services/info/JVMInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.info
-   (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.iapi.services.info.JVMInfo
+
+   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/services/info/ProductGenusNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.info
-   (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.iapi.services.info.ProductGenusNames
+
+   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/iapi/services/info/ProductVersionHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java	Fri Nov 12 09:26:08 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 1998, 2004.
+
+ * Copyright 1998, 2004.WESTHAM
+
  *
  * 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/iapi/services/info/PropertyNames.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.info
-   (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.iapi.services.info.PropertyNames
+
+   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/iapi/services/io/AccessibleByteArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.AccessibleByteArrayOutputStream
+
+   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/iapi/services/io/ApplicationObjectInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ApplicationObjectInputStream
+
+   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/iapi/services/io/ArrayInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ArrayInputStream
+
+   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/iapi/services/io/ArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ArrayOutputStream
+
+   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/iapi/services/io/ArrayUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ArrayUtil
+
+   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/iapi/services/io/CompressedNumber.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.CompressedNumber
+
+   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/iapi/services/io/CounterOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.CounterOutputStream
+
+   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/iapi/services/io/DebugByteTeeOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.DebugByteTeeOutputStream
+
+   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.
 
  */
 package org.apache.derby.iapi.services.io;

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.DynamicByteArrayOutputStream
+
+   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/iapi/services/io/ErrorInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ErrorInfo
+
+   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/iapi/services/io/ErrorObjectInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.ErrorObjectInput
+
+   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/services/io/FileUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FileUtil
+
+   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/iapi/services/io/FormatIdInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatIdInputStream
+
+   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/iapi/services/io/FormatIdOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatIdOutputStream
+
+   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/iapi/services/io/FormatIdUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatIdUtil
+
+   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/iapi/services/io/Formatable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.Formatable
+
+   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/iapi/services/io/FormatableArrayHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableArrayHolder
+
+   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/iapi/services/io/FormatableBitSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableBitSet
+
+   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/iapi/services/io/FormatableHashtable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableHashtable
+
+   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/services/io/FormatableInstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableInstanceGetter
+
+   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/iapi/services/io/FormatableIntHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableIntHolder
+
+   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/services/io/FormatableLongHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableLongHolder
+
+   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/services/io/FormatableProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.FormatableProperties
+
+   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/iapi/services/io/InputStreamUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.InputStreamUtil
+
+   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/iapi/services/io/Limit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.Limit
+
+   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/iapi/services/io/LimitInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.LimitInputStream
+
+   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/iapi/services/io/LimitObjectInput.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.LimitObjectInput
+
+   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/services/io/LimitReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.LimitReader
+
+   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/services/io/NewByteArrayInputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.NewByteArrayInputStream
+
+   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/iapi/services/io/NullOutputStream.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.NullOutputStream
+
+   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/iapi/services/io/RegisteredFormatIds.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.RegisteredFormatIds
+
+   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/iapi/services/io/SQLExceptionWrapper.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.SQLExceptionWrapper
+
+   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/iapi/services/io/Storable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.Storable
+
+   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/iapi/services/io/StoredFormatIds.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.StoredFormatIds
+
+   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/iapi/services/io/StreamStorable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.StreamStorable
+
+   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/iapi/services/io/TypedFormat.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.io
-   (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.iapi.services.io.TypedFormat
+
+   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/iapi/services/loader/ClassFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.ClassFactory
+
+   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/iapi/services/loader/ClassFactoryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.ClassFactoryContext
+
+   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/iapi/services/loader/ClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.ClassInfo
+
+   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/iapi/services/loader/ClassInspector.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.ClassInspector
+
+   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/iapi/services/loader/GeneratedByteCode.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.GeneratedByteCode
+
+   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/iapi/services/loader/GeneratedClass.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.GeneratedClass
+
+   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/iapi/services/loader/GeneratedMethod.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.GeneratedMethod
+
+   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/iapi/services/loader/InstanceGetter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.InstanceGetter
+
+   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/iapi/services/loader/JarReader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.loader
-   (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.iapi.services.loader.JarReader
+
+   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/iapi/services/locks/C_LockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.C_LockFactory
+
+   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/services/locks/Latch.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.Latch
+
+   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/iapi/services/locks/Limit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.Limit
+
+   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/iapi/services/locks/LockFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.LockFactory
+
+   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/iapi/services/locks/Lockable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.Lockable
+
+   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/iapi/services/locks/ShExLockable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.ShExLockable
+
+   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/iapi/services/locks/ShExQual.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.ShExQual
+
+   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/iapi/services/locks/VirtualLockTable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.locks.VirtualLockTable
+
+   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/services/monitor/ModuleControl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.monitor.ModuleControl
+
+   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/iapi/services/monitor/ModuleFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.monitor.ModuleFactory
+
+   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/iapi/services/monitor/ModuleSupportable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.monitor.ModuleSupportable
+
+   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/services/monitor/Monitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.monitor.Monitor
+
+   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/iapi/services/monitor/PersistentService.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.services.monitor.PersistentService
+
+   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/iapi/services/property/PersistentSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.property
-   (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.iapi.services.property.PersistentSet
+
+   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/services/property/PropertyFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.property
-   (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.iapi.services.property.PropertyFactory
+
+   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/iapi/services/property/PropertySetCallback.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.property
-   (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.iapi.services.property.PropertySetCallback
+
+   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/services/property/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.property
-   (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.iapi.services.property.PropertyUtil
+
+   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/iapi/services/property/PropertyValidation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.property
-   (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.iapi.services.property.PropertyValidation
+
+   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/iapi/services/sanity/AssertFailure.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.sanity
-   (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.iapi.services.sanity.AssertFailure
+
+   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/iapi/services/sanity/SanityManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.sanity
-   (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.iapi.services.sanity.SanityManager
+
+   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/iapi/services/stream/HeaderPrintWriter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.stream
-   (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.iapi.services.stream.HeaderPrintWriter
+
+   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/iapi/services/stream/InfoStreams.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.stream
-   (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.iapi.services.stream.InfoStreams
+
+   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/iapi/services/stream/PrintWriterGetHeader.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.stream
-   (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.iapi.services.stream.PrintWriterGetHeader
+
+   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/iapi/services/uuid/UUIDFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.uuid
-   (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.iapi.services.uuid.UUIDFactory
+
+   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/iapi/sql/Activation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Activation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.Activation
+
+   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/iapi/sql/LanguageFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.LanguageFactory
+
+   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/iapi/sql/LanguageProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/LanguageProperties.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.LanguageProperties
+
+   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/iapi/sql/ParameterValueSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.ParameterValueSet
+
+   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/iapi/sql/PreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/PreparedStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.PreparedStatement
+
+   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/iapi/sql/ResultColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.ResultColumnDescriptor
+
+   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/iapi/sql/ResultDescription.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultDescription.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.ResultDescription
+
+   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/iapi/sql/ResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.ResultSet
+
+   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/iapi/sql/Row.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Row.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.Row
+
+   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/iapi/sql/Statement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/Statement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.Statement
+
+   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/iapi/sql/StatementType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.StatementType
+
+   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/iapi/sql/StatementUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StatementUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.StatementUtil
+
+   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/iapi/sql/StorablePreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.StorablePreparedStatement
+
+   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/sql/compile/AccessPath.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.AccessPath
+
+   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/sql/compile/C_NodeTypes.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.C_NodeTypes
+
+   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/sql/compile/CodeGeneration.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.CodeGeneration
+
+   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/iapi/sql/compile/CompilerContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.CompilerContext
+
+   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/iapi/sql/compile/CostEstimate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.CostEstimate
+
+   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/iapi/sql/compile/ExpressionClassBuilderInterface.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.ExpressionClassBuilderInterface
+
+   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/sql/compile/JoinStrategy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.JoinStrategy
+
+   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/iapi/sql/compile/NodeFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.NodeFactory
+
+   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/iapi/sql/compile/Optimizable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.Optimizable
+
+   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/iapi/sql/compile/OptimizableList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.OptimizableList
+
+   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/iapi/sql/compile/OptimizablePredicate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.OptimizablePredicate
+
+   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/iapi/sql/compile/OptimizablePredicateList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.OptimizablePredicateList
+
+   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/iapi/sql/compile/Optimizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.Optimizer
+
+   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/iapi/sql/compile/OptimizerFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.OptimizerFactory
+
+   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/iapi/sql/compile/Parser.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Parser.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.Parser
+
+   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/iapi/sql/compile/RequiredRowOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.RequiredRowOrdering
+
+   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/sql/compile/RowOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.RowOrdering
+
+   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/iapi/sql/compile/TypeCompiler.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.TypeCompiler
+
+   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/sql/compile/TypeCompilerFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.TypeCompilerFactory
+
+   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/sql/compile/Visitable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.Visitable
+
+   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/iapi/sql/compile/Visitor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Visitor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.compile.Visitor
+
+   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/iapi/sql/conn/Authorizer.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.conn.Authorizer
+
+   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/iapi/sql/conn/ConnectionUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.conn
-   (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.iapi.sql.conn.ConnectionUtil
+
+   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/sql/conn/LanguageConnectionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.conn.LanguageConnectionContext
+
+   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/iapi/sql/conn/LanguageConnectionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.conn.LanguageConnectionFactory
+
+   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/iapi/sql/conn/StatementContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.conn.StatementContext
+
+   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/iapi/sql/depend/DependableList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependableList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.DependableList
+
+   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/iapi/sql/depend/Dependency.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependency.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.Dependency
+
+   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/iapi/sql/depend/DependencyManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.DependencyManager
+
+   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/iapi/sql/depend/Dependent.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Dependent.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.Dependent
+
+   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/iapi/sql/depend/Provider.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/Provider.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.Provider
+
+   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/iapi/sql/depend/ProviderInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.depend.ProviderInfo
+
+   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/iapi/sql/depend/ProviderList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.depend
-   (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.iapi.sql.depend.ProviderList
+
+   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/sql/dictionary/AliasDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.AliasDescriptor
+
+   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/sql/dictionary/CatalogRowFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.CatalogRowFactory
+
+   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/iapi/sql/dictionary/CheckConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.CheckConstraintDescriptor
+
+   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/iapi/sql/dictionary/ColumnDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ColumnDescriptor
+
+   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/iapi/sql/dictionary/ColumnDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ColumnDescriptorList
+
+   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/iapi/sql/dictionary/ConglomerateDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ConglomerateDescriptor
+
+   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/iapi/sql/dictionary/ConglomerateDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ConglomerateDescriptorList
+
+   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/iapi/sql/dictionary/ConsInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ConsInfo
+
+   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/iapi/sql/dictionary/ConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ConstraintDescriptor
+
+   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/iapi/sql/dictionary/ConstraintDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ConstraintDescriptorList
+
+   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/iapi/sql/dictionary/DDUtils.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DDUtils
+
+   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/iapi/sql/dictionary/DataDescriptorGenerator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DataDescriptorGenerator
+
+   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/iapi/sql/dictionary/DataDictionary.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DataDictionary
+
+   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/iapi/sql/dictionary/DataDictionaryContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DataDictionaryContext
+
+   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/iapi/sql/dictionary/DefaultDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DefaultDescriptor
+
+   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/sql/dictionary/DependencyDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.DependencyDescriptor
+
+   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/iapi/sql/dictionary/FileInfoDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.FileInfoDescriptor
+
+   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/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ForeignKeyConstraintDescriptor
+
+   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/iapi/sql/dictionary/GenericDescriptorList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.GenericDescriptorList
+
+   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/sql/dictionary/IndexLister.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.IndexLister
+
+   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/iapi/sql/dictionary/IndexRowGenerator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.IndexRowGenerator
+
+   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/iapi/sql/dictionary/KeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.KeyConstraintDescriptor
+
+   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/iapi/sql/dictionary/ListOfRowLists.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ListOfRowLists
+
+   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/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ReferencedKeyConstraintDescriptor
+
+   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/iapi/sql/dictionary/RowList.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.RowList
+
+   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/iapi/sql/dictionary/SPSDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.SPSDescriptor
+
+   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/iapi/sql/dictionary/SchemaDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -2,7 +2,9 @@
  *
  * Product ID: 5697-F53
  *
- * (C) Copyright IBM Corp. 1997, 2004.
+
+ * Copyright 1997, 2004.WESTHAM
+
  *
  * 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/iapi/sql/dictionary/StatisticsDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.StatisticsDescriptor
+
+   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/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.SubCheckConstraintDescriptor
+
+   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/iapi/sql/dictionary/SubConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.SubConstraintDescriptor
+
+   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/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.SubKeyConstraintDescriptor
+
+   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/iapi/sql/dictionary/SystemColumn.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.SystemColumn
+
+   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/iapi/sql/dictionary/TabInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.TabInfo
+
+   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/iapi/sql/dictionary/TableDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.TableDescriptor
+
+   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/iapi/sql/dictionary/TriggerDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.TriggerDescriptor
+
+   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/sql/dictionary/TupleDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.TupleDescriptor
+
+   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/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.UniqueSQLObjectDescriptor
+
+   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/sql/dictionary/UniqueTupleDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.UniqueTupleDescriptor
+
+   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/iapi/sql/dictionary/ViewDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.sql.dictionary
-   (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.iapi.sql.dictionary.ViewDescriptor
+
+   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/iapi/sql/execute/ConstantAction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ConstantAction
+
+   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/iapi/sql/execute/CursorActivation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.CursorActivation
+
+   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/iapi/sql/execute/CursorResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.CursorResultSet
+
+   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/iapi/sql/execute/ExecAggregator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecAggregator
+
+   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/sql/execute/ExecCursorTableReference.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecCursorTableReference
+
+   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/sql/execute/ExecIndexRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecIndexRow
+
+   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/iapi/sql/execute/ExecPreparedStatement.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecPreparedStatement
+
+   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/iapi/sql/execute/ExecRow.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecRow
+
+   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/iapi/sql/execute/ExecutionContext.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecutionContext
+
+   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/iapi/sql/execute/ExecutionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecutionFactory
+
+   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/iapi/sql/execute/ExecutionStmtValidator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ExecutionStmtValidator
+
+   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/sql/execute/NoPutResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.NoPutResultSet
+
+   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/iapi/sql/execute/ResultSetFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ResultSetFactory
+
+   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/iapi/sql/execute/ResultSetStatisticsFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ResultSetStatisticsFactory
+
+   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/iapi/sql/execute/RowChanger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.RowChanger
+
+   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/iapi/sql/execute/RunTimeStatistics.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.RunTimeStatistics
+
+   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/iapi/sql/execute/ScanQualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.ScanQualifier
+
+   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/iapi/sql/execute/TargetResultSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.TargetResultSet
+
+   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/iapi/sql/execute/TemporaryRowHolder.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.TemporaryRowHolder
+
+   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/sql/execute/TupleFilter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.sql.execute.TupleFilter
+
+   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/iapi/store/access/AccessFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.AccessFactory
+
+   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/iapi/store/access/AccessFactoryGlobals.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access
-   (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.iapi.store.access.AccessFactoryGlobals
+
+   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/iapi/store/access/BackingStoreHashtable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.BackingStoreHashtable
+
+   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/store/access/BinaryOrderable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.BinaryOrderable
+
+   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/iapi/store/access/ColumnOrdering.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.ColumnOrdering
+
+   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/iapi/store/access/ConglomPropertyQueryable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.ConglomPropertyQueryable
+
+   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/iapi/store/access/ConglomerateController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.ConglomerateController
+
+   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/iapi/store/access/DatabaseInstant.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.DatabaseInstant
+
+   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/iapi/store/access/DynamicCompiledOpenConglomInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access
-   (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.iapi.store.access.DynamicCompiledOpenConglomInfo
+
+   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/iapi/store/access/FileResource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.FileResource
+
+   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/iapi/store/access/GenericScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GenericScanController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.GenericScanController
+
+   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/store/access/GlobalXact.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GlobalXact.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.GlobalXact
+
+   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/store/access/GroupFetchScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.GroupFetchScanController
+
+   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/store/access/KeyHasher.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/KeyHasher.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.KeyHasher
+
+   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/store/access/Qualifier.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.Qualifier
+
+   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/iapi/store/access/RowCountable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowCountable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.RowCountable
+
+   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/iapi/store/access/RowLocationRetRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.RowLocationRetRowSource
+
+   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/store/access/RowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.RowSource
+
+   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/iapi/store/access/RowUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.RowUtil
+
+   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/iapi/store/access/ScanController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.ScanController
+
+   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/iapi/store/access/ScanInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ScanInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.ScanInfo
+
+   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/iapi/store/access/SortController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.SortController
+
+   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/iapi/store/access/SortCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.SortCostController
+
+   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/iapi/store/access/SortInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.SortInfo
+
+   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/store/access/SortObserver.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortObserver.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.SortObserver
+
+   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/store/access/SpaceInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access
-   (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.iapi.store.access.SpaceInfo
+
+   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/iapi/store/access/StaticCompiledOpenConglomInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access
-   (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.iapi.store.access.StaticCompiledOpenConglomInfo
+
+   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/iapi/store/access/StoreCostController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.StoreCostController
+
+   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/iapi/store/access/StoreCostResult.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.StoreCostResult
+
+   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/iapi/store/access/TransactionController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.TransactionController
+
+   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/iapi/store/access/TransactionInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.TransactionInfo
+
+   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/store/access/XATransactionController.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/XATransactionController.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access
-   (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.iapi.store.access.XATransactionController
+
+   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/iapi/store/access/conglomerate/Conglomerate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.Conglomerate
+
+   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/iapi/store/access/conglomerate/ConglomerateFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.ConglomerateFactory
+
+   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/iapi/store/access/conglomerate/LogicalUndo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.LogicalUndo
+
+   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/iapi/store/access/conglomerate/MethodFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.MethodFactory
+
+   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/iapi/store/access/conglomerate/ScanControllerRowSource.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.ScanControllerRowSource
+
+   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/iapi/store/access/conglomerate/ScanManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.ScanManager
+
+   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/iapi/store/access/conglomerate/Sort.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.Sort
+
+   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/iapi/store/access/conglomerate/SortFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.SortFactory
+
+   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/iapi/store/access/conglomerate/TransactionManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.store.access.conglomerate.TransactionManager
+
+   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/iapi/store/access/xa/XAResourceManager.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access.xa
-   (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.iapi.store.access.xa.XAResourceManager
+
+   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/store/access/xa/XAXactId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.access.xa
-   (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.iapi.store.access.xa.XAXactId
+
+   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/store/raw/AuxObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/AuxObject.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.AuxObject
+
+   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/iapi/store/raw/Compensation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Compensation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Compensation
+
+   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/iapi/store/raw/ContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.ContainerHandle
+
+   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/iapi/store/raw/ContainerKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.ContainerKey
+
+   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/iapi/store/raw/ContainerLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.ContainerLock
+
+   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/iapi/store/raw/Corruptable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Corruptable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Corruptable
+
+   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/iapi/store/raw/D_ContainerKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.D_ContainerKey
+
+   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/store/raw/D_ContainerLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.D_ContainerLock
+
+   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/iapi/store/raw/D_RowLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.D_RowLock
+
+   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/iapi/store/raw/FetchDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.FetchDescriptor
+
+   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/iapi/store/raw/GlobalTransactionId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.GlobalTransactionId
+
+   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/iapi/store/raw/LockingPolicy.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.LockingPolicy
+
+   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/iapi/store/raw/Loggable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Loggable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Loggable
+
+   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/iapi/store/raw/LogicalUndoable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.LogicalUndoable
+
+   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/iapi/store/raw/Page.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Page
+
+   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/iapi/store/raw/PageKey.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageKey.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.PageKey
+
+   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/iapi/store/raw/PageTimeStamp.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.PageTimeStamp
+
+   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/iapi/store/raw/RawStoreFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.RawStoreFactory
+
+   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/iapi/store/raw/RePreparable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RePreparable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.RePreparable
+
+   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/store/raw/RecordHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.RecordHandle
+
+   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/iapi/store/raw/RowLock.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.RowLock
+
+   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/iapi/store/raw/ScanHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.ScanHandle
+
+   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/store/raw/ScannedTransactionHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.ScannedTransactionHandle
+
+   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/iapi/store/raw/StreamContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.StreamContainerHandle
+
+   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/store/raw/Transaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Transaction.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Transaction
+
+   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/iapi/store/raw/Undoable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Undoable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw
-   (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.iapi.store.raw.Undoable
+
+   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/iapi/store/raw/data/DataFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.data
-   (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.iapi.store.raw.data.DataFactory
+
+   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/iapi/store/raw/data/RawContainerHandle.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.data
-   (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.iapi.store.raw.data.RawContainerHandle
+
+   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/iapi/store/raw/log/LogFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.log
-   (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.iapi.store.raw.log.LogFactory
+
+   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/iapi/store/raw/log/LogInstant.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.log
-   (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.iapi.store.raw.log.LogInstant
+
+   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/iapi/store/raw/log/LogScan.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.log
-   (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.iapi.store.raw.log.LogScan
+
+   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/iapi/store/raw/log/Logger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/log/Logger.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.log
-   (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.iapi.store.raw.log.Logger
+
+   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/iapi/store/raw/xact/RawTransaction.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.xact
-   (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.iapi.store.raw.xact.RawTransaction
+
+   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/iapi/store/raw/xact/TransactionFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.xact
-   (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.iapi.store.raw.xact.TransactionFactory
+
+   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/iapi/store/raw/xact/TransactionId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.store.raw.xact
-   (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.iapi.store.raw.xact.TransactionId
+
+   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/iapi/types/BitDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BitDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.BitDataValue
+
+   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/types/BooleanDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/BooleanDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.BooleanDataValue
+
+   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/types/CloneableObject.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CloneableObject.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.CloneableObject
+
+   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/types/ConcatableDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.ConcatableDataValue
+
+   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/types/DTSClassInfo.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DTSClassInfo.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DTSClassInfo
+
+   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/iapi/types/DataType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataType
+
+   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/types/DataTypeDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataTypeDescriptor
+
+   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/types/DataTypeUtilities.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataTypeUtilities
+
+   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/iapi/types/DataValueDescriptor.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataValueDescriptor
+
+   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/types/DataValueFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataValueFactory
+
+   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/types/DataValueFactoryImpl.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DataValueFactoryImpl
+
+   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/types/DateTimeDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.DateTimeDataValue
+
+   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/types/DateTimeParser.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DateTimeParser.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.types
-   (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.iapi.types.DateTimeParser
+
+   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/iapi/types/JSQLType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/JSQLType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.JSQLType
+
+   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/types/Like.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.Like
+
+   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/types/NumberDataType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.NumberDataType
+
+   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/types/NumberDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.NumberDataValue
+
+   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/types/Orderable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.Orderable
+
+   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/types/RefDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RefDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.RefDataValue
+
+   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/types/Resetable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Resetable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.Resetable
+
+   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/iapi/types/RowLocation.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/RowLocation.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.RowLocation
+
+   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/types/SQLBinary.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.types
-   (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.iapi.types.SQLBinary
+
+   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/iapi/types/SQLBit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLBit
+
+   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/types/SQLBlob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBlob.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.types
-   (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.iapi.types.SQLBlob
+
+   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/iapi/types/SQLBoolean.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLBoolean
+
+   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/types/SQLChar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLChar
+
+   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/types/SQLClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLClob.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLClob
+
+   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/iapi/types/SQLDate.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLDate
+
+   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/iapi/types/SQLDecimal.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLDecimal
+
+   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/types/SQLDouble.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLDouble
+
+   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/types/SQLInteger.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLInteger
+
+   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/types/SQLLongVarbit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLLongVarbit
+
+   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/types/SQLLongint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLLongint
+
+   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/types/SQLLongvarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLLongvarchar
+
+   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/types/SQLNClob.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNClob.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLNClob
+
+   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/iapi/types/SQLNationalChar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalChar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLNationalChar
+
+   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/iapi/types/SQLNationalLongvarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLNationalLongvarchar
+
+   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/iapi/types/SQLNationalVarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLNationalVarchar
+
+   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/iapi/types/SQLReal.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLReal
+
+   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/types/SQLRef.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLRef.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLRef
+
+   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/types/SQLSmallint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLSmallint
+
+   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/types/SQLTime.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLTime
+
+   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/iapi/types/SQLTimestamp.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLTimestamp
+
+   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/iapi/types/SQLTinyint.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLTinyint
+
+   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/types/SQLVarbit.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarbit.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLVarbit
+
+   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/types/SQLVarchar.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLVarchar.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.SQLVarchar
+
+   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/types/StringDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/StringDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.StringDataValue
+
+   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/types/TypeId.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/TypeId.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.TypeId
+
+   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/types/UserDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.UserDataValue
+
+   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/types/UserType.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.UserType
+
+   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/types/VariableSizeDataValue.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.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.iapi.types.VariableSizeDataValue
+
+   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/util/ByteArray.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ByteArray.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.util
-   (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.iapi.util.ByteArray
+
+   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/iapi/util/CheapDateFormatter.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.util
-   (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.iapi.util.CheapDateFormatter
+
+   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/iapi/util/DoubleProperties.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/DoubleProperties.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.DoubleProperties
+
+   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/util/IdUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.IdUtil
+
+   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/iapi/util/JBitSet.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/JBitSet.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.JBitSet
+
+   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/iapi/util/Matchable.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Matchable.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.Matchable
+
+   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/iapi/util/Operator.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/Operator.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.Operator
+
+   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/iapi/util/PropertyUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/PropertyUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.util
-   (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.iapi.util.PropertyUtil
+
+   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/iapi/util/ReuseFactory.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/ReuseFactory.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.ReuseFactory
+
+   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/util/StringUtil.java
==============================================================================
--- incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java	(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java	Fri Nov 12 09:26:08 2004
@@ -1,10 +1,20 @@
 /*
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package com.ihost.cs
-   (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 com.ihost.cs.StringUtil
+
+   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.
 
  */