You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2006/08/08 22:57:00 UTC

svn commit: r429811 [1/3] - in /db/derby/code/trunk/java/engine/org/apache/derby/iapi/services: ./ cache/ classfile/ compiler/ context/ crypto/ daemon/ diag/ i18n/ info/ io/ loader/ locks/ memory/ monitor/ property/ sanity/ stream/ timer/ uuid/

Author: rhillegas
Date: Tue Aug  8 13:56:54 2006
New Revision: 429811

URL: http://svn.apache.org/viewvc?rev=429811&view=rev
Log:
DERBY-1377: Rototill tree under java/engine/org/apache/derby/iapi/services/

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FileUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Formatable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Limit.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/LimitReader.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/Storable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/StreamStorable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/build.xml
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/loader/JarReader.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Latch.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Limit.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/ShExQual.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/memory/LowMemory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PersistentSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/build.xml Tue Aug  8 13:56:54 2006
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 
 <project default="compile" basedir="../../../../../../..">
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheManager.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/Cacheable.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/ClassSize.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/Attributes.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/LocalField.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/Context.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextImpl.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextManager.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ShutdownException.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/SystemContext.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherFactoryBuilder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    Derby - Class org.apache.derby.iapi.services.crypto.CipherFactoryBuilder
 
-   Copyright 1998, 2006 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/crypto/build.xml Tue Aug  8 13:56:54 2006
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 
 <project default="compile" basedir="../../../../../../../..">
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/diag/Performance.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/i18n/MessageService.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/JVMInfo.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    Derby - Class org.apache.derby.iapi.services.info.ProductVersionHolder
 
-   Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/PropertyNames.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java?rev=429811&r1=429810&r2=429811&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java Tue Aug  8 13:56:54 2006
@@ -2,11 +2,12 @@
 
    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
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to you under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0