Nothing fancy, just changing IBM Copyright notices to ASF. However, it affects a lot of files.

Attached is a unified diff file.
Index: java/build/org/apache/derbyBuild/ClassSizeCrawler.java
===================================================================
--- java/build/org/apache/derbyBuild/ClassSizeCrawler.java      (revision 43386)
+++ java/build/org/apache/derbyBuild/ClassSizeCrawler.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.cache
-   (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.
 
- */
-
 package org.apache.derbyBuild;
 
 import org.apache.derby.iapi.services.cache.ClassSize;
Index: java/build/org/apache/derbyBuild/splitmessages.java
===================================================================
--- java/build/org/apache/derbyBuild/splitmessages.java (revision 43386)
+++ java/build/org/apache/derbyBuild/splitmessages.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild
-   (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.
 
- */
-
 package org.apache.derbyBuild;
 
 import java.io.*;
Index: java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java
===================================================================
--- java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java       
(revision 43386)
+++ java/build/org/apache/derbyBuild/javadoc/EndFormatTaglet.java       
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild.javadoc
-   (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.
-
- */
 package org.apache.derbyBuild.javadoc;
 
 import com.sun.tools.doclets.Taglet;
Index: java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java
===================================================================
--- java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java        
(revision 43386)
+++ java/build/org/apache/derbyBuild/javadoc/FormatIdTaglet.java        
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild.javadoc
-   (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.
-
- */
 package org.apache.derbyBuild.javadoc;
 
 import com.sun.tools.doclets.Taglet;
Index: java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java
===================================================================
--- java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java (revision 43386)
+++ java/build/org/apache/derbyBuild/javadoc/UpgradeTaglet.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild.javadoc
-   (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.
 
- */
-
 package org.apache.derbyBuild.javadoc;
 
 import com.sun.tools.doclets.Taglet;
Index: java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java
===================================================================
--- java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java      
(revision 43386)
+++ java/build/org/apache/derbyBuild/javadoc/DiskLayoutTaglet.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild.javadoc
-   (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.
 
- */
-
 package org.apache.derbyBuild.javadoc;
 
 import com.sun.tools.doclets.Taglet;
Index: java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java
===================================================================
--- java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java (revision 43386)
+++ java/build/org/apache/derbyBuild/javadoc/PurposeTaglet.java (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild.javadoc
-   (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.
-
- */
 package org.apache.derbyBuild.javadoc;
 
 import com.sun.tools.doclets.Taglet;
Index: java/build/org/apache/derbyBuild/classlister.java
===================================================================
--- java/build/org/apache/derbyBuild/classlister.java   (revision 43386)
+++ java/build/org/apache/derbyBuild/classlister.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derbyBuild;
 
 import org.apache.derby.iapi.services.classfile.*;
Index: java/build/org/apache/derbyBuild/propertyconfig.java
===================================================================
--- java/build/org/apache/derbyBuild/propertyconfig.java        (revision 43386)
+++ java/build/org/apache/derbyBuild/propertyconfig.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derbyBuild
-   (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.
 
- */
-
 package org.apache.derbyBuild;
 import java.util.Properties;
 import java.io.FileInputStream;
Index: java/tools/org/apache/derby/tools/URLCheck.java
===================================================================
--- java/tools/org/apache/derby/tools/URLCheck.java     (revision 43386)
+++ java/tools/org/apache/derby/tools/URLCheck.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.tools
-   (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.
 
- */
-
 package org.apache.derby.tools;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/tools/org/apache/derby/tools/ij.java
===================================================================
--- java/tools/org/apache/derby/tools/ij.java   (revision 43386)
+++ java/tools/org/apache/derby/tools/ij.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.tools
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.tools;
 
 import org.apache.derby.iapi.services.info.JVMInfo;
Index: java/tools/org/apache/derby/tools/JDBCDisplayUtil.java
===================================================================
--- java/tools/org/apache/derby/tools/JDBCDisplayUtil.java      (revision 43386)
+++ java/tools/org/apache/derby/tools/JDBCDisplayUtil.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.tools
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.tools;
 
 import java.io.PrintStream;
Index: java/tools/org/apache/derby/tools/dblook.java
===================================================================
--- java/tools/org/apache/derby/tools/dblook.java       (revision 43386)
+++ java/tools/org/apache/derby/tools/dblook.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.tools
-   (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.
 
- */
-
 package org.apache.derby.tools;
 
 import java.io.BufferedReader;
Index: java/tools/org/apache/derby/tools/sysinfo.java
===================================================================
--- java/tools/org/apache/derby/tools/sysinfo.java      (revision 43386)
+++ java/tools/org/apache/derby/tools/sysinfo.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.tools
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.tools;
 
 import org.apache.derby.iapi.services.info.ProductVersionHolder;
Index: java/tools/org/apache/derby/impl/tools/ij/mtTime.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/mtTime.java       (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/mtTime.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 /**
Index: java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java      
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/AttributeHolder.java      
(working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
 
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/tools/org/apache/derby/impl/tools/ij/mtTester.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/mtTester.java     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/mtTester.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.util.Vector;
Index: java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java        
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ConnectionEnv.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.io.File;
Index: java/tools/org/apache/derby/impl/tools/ij/xaHelper.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/xaHelper.java     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/xaHelper.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
Index: java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java        
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijMultiResult.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/util.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/util.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/util.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.tools.JDBCDisplayUtil;
Index: java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java    
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijExceptionResult.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.SQLException;
Index: java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java   
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijConnectionResult.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/ijException.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijException.java  (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijException.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
Index: java/tools/org/apache/derby/impl/tools/ij/Session.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/Session.java      (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/Session.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.tools.i18n.LocalizedOutput;
Index: java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijResultImpl.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
Index: java/tools/org/apache/derby/impl/tools/ij/ij.jj
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ij.jj     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ij.jj     (working copy)
@@ -15,6 +15,22 @@
 }
 
 PARSER_BEGIN(ij)
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 package org.apache.derby.impl.tools.ij;
 
Index: java/tools/org/apache/derby/impl/tools/ij/utilMain14.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/utilMain14.java   (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/utilMain14.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.ij;
                 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/tools/org/apache/derby/impl/tools/ij/ParseException.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ParseException.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ParseException.java       
(working copy)
@@ -1,12 +1,19 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 3.0 
*/
 /*
-
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 package org.apache.derby.impl.tools.ij;
 
Index: java/tools/org/apache/derby/impl/tools/ij/Main14.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/Main14.java       (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/Main14.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.tools.JDBCDisplayUtil;
Index: java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java  (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijRowResult.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java     
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijFatalException.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
Index: java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java     
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/xaAbstractHelper.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 
Index: java/tools/org/apache/derby/impl/tools/ij/ijResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijResult.java     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijResult.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/AsyncStatement.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java     
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/UCode_CharStream.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (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.
 
- */
-
 /* Generated By:JavaCC: Do not edit this line. UCode_CharStream.java Version 
0.7pre6 */
 package org.apache.derby.impl.tools.ij;
 
Index: java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj      (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj      (working copy)
@@ -14,6 +14,22 @@
 }
 
 PARSER_BEGIN(mtGrammar)
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 package org.apache.derby.impl.tools.ij;
 
Index: java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java   (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/mtTestCase.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.util.Hashtable;
Index: java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java     
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijTokenException.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 public class ijTokenException extends RuntimeException {
Index: java/tools/org/apache/derby/impl/tools/ij/utilMain.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/utilMain.java     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/utilMain.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
                 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijVectorResult.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.util.Vector;
Index: java/tools/org/apache/derby/impl/tools/ij/Main.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/Main.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/Main.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import org.apache.derby.tools.JDBCDisplayUtil;
Index: java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java    
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijStatementResult.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java      
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/ijWarningResult.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java  (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/mtTestSuite.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.util.Vector;
Index: java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java      
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.ij
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.ij;
 
 import java.io.IOException;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_View.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_View.java  (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_View.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java   (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/Logs.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/Logs.java     (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/Logs.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.io.PrintWriter;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java        
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java   (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.cslook
-   (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.
 
- */
-
 package org.apache.derby.impl.tools.cslook;
 
 import java.sql.Connection;
Index: java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/sysinfo/Main.java    (revision 43386)
+++ java/tools/org/apache/derby/impl/tools/sysinfo/Main.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.sysinfo
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.tools.sysinfo;
 
 import java.util.Locale;
Index: java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java
===================================================================
--- java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java       
(revision 43386)
+++ java/tools/org/apache/derby/impl/tools/sysinfo/ZipInfoProperties.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.tools.sysinfo
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 //ZipInfoProperties
 
 package org.apache.derby.impl.tools.sysinfo;
Index: java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java
===================================================================
--- java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java     
(revision 43386)
+++ java/tools/org/apache/derby/iapi/tools/i18n/LocalizedInput.java     
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.tools.i18n
-   (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.
-
- */
 package org.apache.derby.iapi.tools.i18n;
 
 import java.io.InputStreamReader;
Index: java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java
===================================================================
--- java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java    
(revision 43386)
+++ java/tools/org/apache/derby/iapi/tools/i18n/LocalizedOutput.java    
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.tools.i18n
-   (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.
-
- */
 package org.apache.derby.iapi.tools.i18n;
 
 import java.io.PrintWriter;
Index: java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
===================================================================
--- java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java  
(revision 43386)
+++ java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java  
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.tools.i18n
-   (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.
-
- */
 package org.apache.derby.iapi.tools.i18n;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/authentication/UserAuthenticator.java
===================================================================
--- java/engine/org/apache/derby/authentication/UserAuthenticator.java  
(revision 43386)
+++ java/engine/org/apache/derby/authentication/UserAuthenticator.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.authentication;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/impl/sql/GenericStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericStatement.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericStatement.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
Index: java/engine/org/apache/derby/impl/sql/CursorTableReference.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/CursorTableReference.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/CursorTableReference.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.sql.execute.ExecCursorTableReference;
Index: java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NodeFactoryImpl.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/impl/sql/compile/CastNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CastNode.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CastNode.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropViewNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/NotNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NotNode.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NotNode.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: 
java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/MaxMinAggregateDefinition.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/compile/FromTable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/FromTable.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/FromTable.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.ClassName;
Index: 
java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/HasVariantValueNodeVisitor.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/OrNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrNode.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrNode.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CompilerContext;
Index: java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/TableName.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TableName.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TableName.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/ParseException.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ParseException.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ParseException.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TimeTypeCompiler.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ActivationClassBuilder.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.ClassBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BitConstantNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.BitDataValue;
Index: 
java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/VerifyAggregateExpressionsVisitor.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable; 
Index: java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NumericTypeCompiler.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TimestampTypeCompiler.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/Predicate.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/Predicate.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/Predicate.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.impl.sql.compile.ExpressionClassBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
   (working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable; 
Index: 
java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable;
Index: java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RefTypeCompiler.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: 
java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BaseJoinStrategy.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: 
java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/BinaryArithmeticOperatorNode.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/Token.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/Token.java    (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/Token.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AlterTableNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AllResultColumn.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HashNodeList.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SelectNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SelectNode.java       
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
-
- */
                      
 
 package        org.apache.derby.impl.sql.compile;
Index: java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Optimizable;
Index: java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.execute.ExecutionFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TableElementNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HasCorrelatedCRsVisitor.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/C_NodeNames.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BooleanTypeCompiler.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SavepointNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SQLBooleanConstantNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ExecSPSNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TransactionStatementNode.java 
(working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NumericConstantNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: 
java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CursorNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CursorNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ColumnOrdering.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.RowOrdering;
Index: java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NOPStatementNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: 
java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateSchemaNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UserDefinedTypeCompiler.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OptimizerFactoryImpl.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.store.access.ColumnOrdering;
Index: java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CollectNodesVisitor.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UnionNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UnionNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AccessPathImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/Level2CostEstimateImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AlterSPSNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: 
java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/GetCurrentConnectionNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: 
java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Optimizable;
Index: java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CLOBTypeCompiler.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ReadCursorNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.Property;
Index: 
java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.RowOrdering;
Index: java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CharStream.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CharStream.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CharStream.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 /**
Index: 
java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/impl/sql/compile/FromList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/FromList.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/FromList.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BooleanConstantNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropStatementNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderByList.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderByList.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CompilerContext;
Index: 
java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/LockTableNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BaseTypeCompiler.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.BitDataValue;
Index: java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/StringSlicer.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import java.lang.Math;
Index: java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CurrentIsolationNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.store.access.Qualifier;
Index: java/engine/org/apache/derby/impl/sql/compile/RenameNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RenameNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RenameNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: 
java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/BinaryRelationalOperatorNode.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.ClassName;
Index: 
java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/FKConstraintDefinitionNode.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.TypeId;
Index: 
java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TypeCompilerFactoryImpl.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.TypeCompilerFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/FromVTI.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/FromVTI.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: 
java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateStatementNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HasNodeVisitor.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ConstraintDefinitionNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.StatementType;
Index: java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.catalog.IndexDescriptor;
Index: java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UCode_CharStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 /* Generated By:JavaCC: Do not edit this line. UCode_CharStream.java Version 
0.7pre6 */
 package org.apache.derby.impl.sql.compile;
 
Index: java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/LOBTypeCompiler.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/InsertNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/InsertNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/IsNullNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.ClassName;
Index: java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.impl.sql.compile.QueryTreeNode;
Index: java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TriggerReferencingStruct.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/impl/sql/compile/IsNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/IsNode.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/IsNode.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/GroupByList.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/GroupByList.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CompilerContext;
Index: java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (working copy)
@@ -16,15 +16,21 @@
 }
 
 PARSER_BEGIN(SQLParser)
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2003, 2004.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.compile;
Index: java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.ClassName;
Index: java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ExpressionClassBuilder.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 
Index: java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TableElementList.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TableElementList.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AggregateDefinition.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import java.lang.StringBuffer;
Index: java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropSPSNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable;
Index: java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/Level2OptimizerFactoryImpl.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: 
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/ConcatenationOperatorNode.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/AndNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/AndNode.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/AndNode.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/StatementNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/StatementNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CharTypeCompiler.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DateTypeCompiler.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.store.access.Qualifier;
Index: java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropTableNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropSchemaNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/PredicateList.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/PredicateList.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/LOBConstantNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.StringDataValue;
Index: 
java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DefaultVTIModDeferPolicy.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.vti.DeferModification;
Index: java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropTriggerNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CompilerContext;
Index: java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DropIndexNode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CountAggregateDefinition.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/BitTypeCompiler.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: 
java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: 
java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ReferencedTablesVisitor.java  
(working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable; 
Index: java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ValueNode.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ValueNode.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CostEstimateImpl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CostEstimate;
Index: java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CurrentUserNode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.CompilerContext;
Index: java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 
Index: 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.services.compiler.MethodBuilder;
Index: java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.C_NodeTypes;
Index: java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/RemapCRsVisitor.java  
(working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.sql.compile.Visitable; 
Index: java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/compile/CharConstantNode.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.compile
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.compile;
 
 import org.apache.derby.iapi.types.StringDataValue;
Index: java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericLanguageFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.property.PropertyFactory;
Index: 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.services.context.ContextImpl;
Index: java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.services.context.Context;
Index: 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionFactory.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/conn/GenericAuthorizer.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/conn/CachedStatement.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.conn
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.conn;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/GenericParameter.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericParameter.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericParameter.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.loader.ClassInspector;
Index: java/engine/org/apache/derby/impl/sql/GenericClassInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericClassInfo.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericClassInfo.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/depend/BasicDependency.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.depend;
 
 import org.apache.derby.iapi.sql.depend.Dependency;
Index: java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/depend/BasicProviderInfo.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.depend;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/depend/DepClassInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.depend;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/depend/BasicDependencyManager.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.depend
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.depend;
 
 import org.apache.derby.catalog.Dependable;
Index: java/engine/org/apache/derby/impl/sql/GenericResultDescription.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericResultDescription.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericResultDescription.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
Index: 
java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericStorablePreparedStatement.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.monitor.ModuleFactory;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexChanger.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateTriggerConstantAction.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.store.access.TransactionController;
Index: 
java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ExecutionContext;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ProjectRestrictResultSet.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SumAggregator.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/HashLeftOuterJoinResultSet.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericQualifier.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.Activation;
Index: java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/HashJoinResultSet.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/LastIndexKeyResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericAggregator.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.types.NumberDataValue;
Index: java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/UpdateVTIResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: 
java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SetSchemaConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 
Index: java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/MaterializedResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SystemAggregator.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CountAggregator.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/SetTransactionIsolationConstantAction.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/MaxMinAggregator.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropSchemaConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/JarDDL.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/JarDDL.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/JarDDL.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DistinctScanResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/HashScanResultSet.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/execute/ValueRow.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ValueRow.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ValueRow.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.Storable;
Index: java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TriggerEvent.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 /**
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericExecutionContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ExecutionContext;
Index: java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ColumnInfo.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CallStatementResultSet.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AutoincrementCounter.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
Index: java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericTriggerExecutor.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ReplaceJarConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateConstraintConstantAction.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TriggerEventActivator.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ForeignKeyRIChecker.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateTableConstantAction.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ConstantAction;
Index: java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TriggerEvents.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 /**
Index: java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ReferencedKeyRIChecker.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/UpdatableVTIConstantAction.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
Index: java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AddJarConstantAction.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AggregatorInfo.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.ResultDescription;
Index: java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/InsertVTIResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropSPSConstantAction.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateIndexConstantAction.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/BasicNoPutResultSetImpl.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CreateViewConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ConstantAction;
Index: java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/JarUtil.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/JarUtil.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.reference.Property;
Index: 
java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SetTransactionResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TriggerInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RenameConstantAction.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.dictionary.SchemaDescriptor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SavepointConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ConstantAction;
Index: java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RowResultSet.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteCascadeResultSetStatistics.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealRowResultSetStatistics.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealBasicNoPutResultSetStatistics.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealMaterializedResultSetStatistics.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.util.PropertyUtil;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/rts/ResultSetStatistics.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 /**
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopLeftOuterJoinStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/rts/RealSortStatistics.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
      (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashLeftOuterJoinStatistics.java
      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteVTIResultSetStatistics.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RunTimeStatisticsImpl.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealAnyResultSetStatistics.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/rts/RealVTIStatistics.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUnionResultSetStatistics.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashJoinStatistics.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealCurrentOfStatistics.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
       (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealLastIndexKeyScanStatistics.java
       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealJoinResultSetStatistics.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNormalizeResultSetStatistics.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScalarAggregateStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertResultSetStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoPutResultSetStatistics.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
      (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealIndexRowToBaseRowStatistics.java
      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealProjectRestrictStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealScrollInsensitiveResultSetStatistics.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealHashTableStatistics.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNestedLoopJoinStatistics.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealUpdateResultSetStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealOnceResultSetStatistics.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealNoRowsResultSetStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealInsertVTIResultSetStatistics.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
       (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealGroupedAggregateStatistics.java
       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDeleteResultSetStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScalarAggregateStatistics.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute.rts
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute.rts;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DistinctScalarAggregateResultSet.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateSchemaConstantAction.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ConstantAction;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericRIChecker.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CurrentDatetime.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 /* can't import due to name overlap:
Index: 
java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/RealResultSetStatisticsFactory.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DMLWriteResultSet.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/NoPutResultSetImpl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/UnionResultSet.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AggregateSortObserver.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.store.access.SortObserver;
Index: 
java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/StatementTriggerExecutor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericSPSConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/NormalizeResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexConstantAction.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AvgAggregator.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DropConstraintConstantAction.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DropStatisticsConstantAction.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.Activation;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ScalarAggregateResultSet.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/ScrollInsensitiveResultSet.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexValueRow.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexRow.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexRow.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexRow.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/OnceResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/SortResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CardinalityCounter.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.FormatableBitSet;
Index: java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RowUtil.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RowUtil.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
  
 import org.apache.derby.iapi.services.context.ContextManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/UpdateStatisticsConstantAction.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/LockTableConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexSetChanger.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/BaseExpressionActivation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RIBulkChecker.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DependentResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericConstantAction.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.ModuleFactory;
Index: java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/BulkTableScanResultSet.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropAliasConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/GroupedAggregateResultSet.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/MergeJoinResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/SetConstraintsConstantAction.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/BaseActivation.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CursorActivation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 /**
Index: 
java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/IndexRowToBaseRowResultSet.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AlterSPSConstantAction.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/HashTableResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ConstantActionActivation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RowTriggerExecutor.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.CursorResultSet;
Index: java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RISetChecker.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/FKInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/FKInfo.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/FKInfo.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/InsertConstantAction.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
Index: java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.FormatableBitSet;
Index: java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericExecutionFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.Activation;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DistinctGroupedAggregateResultSet.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/UpdateResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ConstraintInfo.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.dictionary.ConsInfo;
Index: java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/MiscResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropViewConstantAction.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/NestedLoopJoinResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DeleteConstantAction.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.ArrayUtil;
Index: java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/GenericScanQualifier.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropTableConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.execute.ConstantAction;
Index: 
java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/KeyToBaseRowConstantAction.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute; 
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/ConstraintConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DropTriggerConstantAction.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DeleteVTIResultSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/CreateSPSConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.store.access.TransactionController;
Index: 
java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/NestedLoopLeftOuterJoinResultSet.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/BasicSortObserver.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.store.access.SortObserver;
Index: java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AnyResultSet.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/OrderableAggregator.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropIndexConstantAction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DropJarConstantAction.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/DDLConstantAction.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.sql.depend.DependableList;
Index: java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/VTIResultSet.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: 
java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/UniqueIndexSortObserver.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/IndexColumnOrder.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.store.access.ColumnOrdering;
Index: 
java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/CreateAliasConstantAction.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: 
java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/DDLSingleTableConstantAction.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/AggregatorInfoList.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
Index: 
java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/execute/GenericAggregateResultSet.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.execute
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.execute;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericPreparedStatement.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/LanguageDbPropertySetter.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.property.PropertySetCallback;
Index: java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericParameterValueSet.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericColumnDescriptor.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
Index: java/engine/org/apache/derby/impl/sql/CursorInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/CursorInfo.java       (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/CursorInfo.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.sql.ResultColumnDescriptor;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSCOLUMNSRowFactory.java     
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSALIASESRowFactory.java     
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/TableKey.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/TableKey.java (revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/TableKey.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/DDColumnDependableFinder.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.io.FormatableBitSet;
Index: java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/IndexInfoImpl.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSSTATISTICSRowFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
Index: java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/DropDependencyFilter.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/OIDTDCacheable.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSVIEWSRowFactory.java       
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/IndexScan.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SPSNameCacheable.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/TDCacheable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSCHECKSRowFactory.java      
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSFILESRowFactory.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.reference.JDBC30Translation;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSTABLESRowFactory.java      
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSKEYSRowFactory.java        
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSDEPENDSRowFactory.java     
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSSCHEMASRowFactory.java     
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSFOREIGNKEYSRowFactory.java 
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSTRIGGERSRowFactory.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSSTATEMENTSRowFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/NameTDCacheable.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/catalog/SYSCONGLOMERATESRowFactory.java   
    (working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/DDdependableFinder.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SystemColumnImpl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSCONSTRAINTSRowFactory.java 
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 2000, 2001
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.sql.catalog;
Index: 
java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryContextImpl.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.context.ContextImpl;
Index: java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/CoreDDFinderClassInfo.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/SYSDUMMY1RowFactory.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.sql.dictionary.SystemColumn;
Index: java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql.catalog;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java
===================================================================
--- java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/sql/GenericActivationHolder.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.sql
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.sql;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/impl/load/ImportReadData.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ImportReadData.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ImportReadData.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.io.BufferedReader;
Index: java/engine/org/apache/derby/impl/load/Export.java
===================================================================
--- java/engine/org/apache/derby/impl/load/Export.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/load/Export.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.Connection;
Index: java/engine/org/apache/derby/impl/load/ExportAbstract.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ExportAbstract.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ExportAbstract.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.Connection;
Index: java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/load/ImportResultSetMetaData.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/impl/load/ExportWriteData.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ExportWriteData.java (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ExportWriteData.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.io.FileOutputStream;
Index: java/engine/org/apache/derby/impl/load/LoadError.java
===================================================================
--- java/engine/org/apache/derby/impl/load/LoadError.java       (revision 43386)
+++ java/engine/org/apache/derby/impl/load/LoadError.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/impl/load/ColumnInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ColumnInfo.java      (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ColumnInfo.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.ResultSet;
Index: java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/load/ExportWriteDataAbstract.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 abstract class ExportWriteDataAbstract {
Index: java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/load/ExportResultSetForObject.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.Connection;
Index: java/engine/org/apache/derby/impl/load/Import.java
===================================================================
--- java/engine/org/apache/derby/impl/load/Import.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/load/Import.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.ResultSet;
Index: java/engine/org/apache/derby/impl/load/ControlInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ControlInfo.java     (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ControlInfo.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.io.PrintStream;
Index: java/engine/org/apache/derby/impl/load/ImportAbstract.java
===================================================================
--- java/engine/org/apache/derby/impl/load/ImportAbstract.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/load/ImportAbstract.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.load
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.load;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnectionContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 //depot/main/java/org.apache.derby.impl.jdbc/EmbedConnectionContext.java#24 - 
edit change 16899 (text)
 package org.apache.derby.impl.jdbc;
 
Index: java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedSavepoint30.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.impl.jdbc.EmbedConnection;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java       (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java       (working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedClob.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedClob.java       (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedClob.java       (working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedParameterMetaData30.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.sql.ParameterValueSet;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedSQLWarning.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement20.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.math.BigDecimal;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement30.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.math.BigDecimal;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement20.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.impl.jdbc.EmbedConnection;
Index: java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/RawToBinaryFormatStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement30.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.impl.jdbc.EmbedConnection;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedResultSetMetaData.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.sql.ResultDescription;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnection20.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.sql.SQLException;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/NoneAuthenticationServiceImpl.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationSchemeBase.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/JNDIAuthenticationService.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/LDAPAuthenticationSchemeImpl.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/SpecificAuthenticationServiceImpl.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
===================================================================
--- 
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/jdbc/authentication/AuthenticationServiceBase.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc.authentication
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc.authentication;
 
 import org.apache.derby.authentication.UserAuthenticator;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnection30.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.services.info.ProductGenusNames;
Index: java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/ConnectionChild.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.jdbc.Driver169;
Index: java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java      (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/UTF8Reader.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedSQLException.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/jdbc/Util.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/Util.java    (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/Util.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/BinaryToRawStream.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/ReaderToAscii.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.jdbc.Driver169;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.sql.ParameterValueSet;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedPreparedStatement.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/ReaderToUTF8Stream.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedResultSet20.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.reference.JDBC20Translation;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedParameterSetMetaData.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.iapi.sql.Activation;
Index: java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java
===================================================================
--- java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (revision 43386)
+++ java/engine/org/apache/derby/impl/jdbc/EmbedConnection.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.jdbc
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.jdbc;
 
 import org.apache.derby.jdbc.Driver169;
Index: java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/jce/JCECipherFactory.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.jce
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.jce;
 
 import org.apache.derby.iapi.services.crypto.CipherFactory;
Index: java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java
===================================================================
--- java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/jce/JCECipherProvider.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.jce
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.jce;
 
 import org.apache.derby.iapi.services.crypto.CipherFactory;
Index: java/engine/org/apache/derby/impl/services/cache/CacheStat.java
===================================================================
--- java/engine/org/apache/derby/impl/services/cache/CacheStat.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/cache/CacheStat.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.cache;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/services/cache/ClockFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/services/cache/ClockFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/cache/ClockFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.cache;
 
 import org.apache.derby.iapi.services.cache.CacheFactory;
Index: java/engine/org/apache/derby/impl/services/cache/CachedItem.java
===================================================================
--- java/engine/org/apache/derby/impl/services/cache/CachedItem.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/cache/CachedItem.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.cache;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/services/cache/Clock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/cache/Clock.java (revision 43386)
+++ java/engine/org/apache/derby/impl/services/cache/Clock.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.cache
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.cache;
 
 import org.apache.derby.iapi.services.cache.CacheManager;
Index: java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java
===================================================================
--- java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/daemon/ServiceRecord.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.daemon;
 
 import org.apache.derby.iapi.services.daemon.Serviceable;
Index: 
java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/daemon/SingleThreadDaemonFactory.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.daemon;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java
===================================================================
--- java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/daemon/BasicDaemon.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.daemon
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.daemon;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: 
java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/ReflectLoaderJava2.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.util.ByteArray;
Index: java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/JarFileJava2.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/DatabaseClasses.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/services/reflect/JarLoader.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/JarLoader.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/JarLoader.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.impl.sql.execute.JarUtil;
Index: java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/ReflectMethod.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: 
java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/ReflectClassesJava2.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 import org.apache.derby.iapi.util.ByteArray;
 
Index: java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/GCInstanceFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.loader.GeneratedByteCode;
Index: java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/UpdateLoader.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: 
java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/reflect/ReflectGeneratedClass.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.loader.GeneratedMethod;
Index: java/engine/org/apache/derby/impl/services/reflect/JarFile.java
===================================================================
--- java/engine/org/apache/derby/impl/services/reflect/JarFile.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/reflect/JarFile.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import java.util.zip.ZipFile;
Index: 
java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/reflect/LoadedGeneratedClass.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.reflect
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.reflect;
 
 import org.apache.derby.iapi.services.loader.GeneratedByteCode;
Index: java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/uuid/BasicUUIDFactory.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.uuid;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java
===================================================================
--- java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/uuid/BasicUUIDGetter.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.uuid;
 
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
Index: java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java
===================================================================
--- java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/uuid/BasicUUID.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.uuid
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.uuid;
 
 import org.apache.derby.iapi.services.io.FormatIdUtil;
Index: 
java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/monitor/UpdateServiceProperties.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.PersistentService;
Index: java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/BaseMonitor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/monitor/PersistentServiceImpl.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: java/engine/org/apache/derby/impl/services/monitor/TopService.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/TopService.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/TopService.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.ModuleControl;
Index: java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/FileMonitor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: 
java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/ServiceBootContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/ModuleInstance.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.PersistentService;
Index: java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/ProtocolKey.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java
===================================================================
--- java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/monitor/ReadOnly.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.monitor
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.monitor;
 
 import org.apache.derby.iapi.services.monitor.PersistentService;
Index: 
java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java
===================================================================
--- 
java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/services/stream/BasicHeaderPrintWriter.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.stream;
 
 import org.apache.derby.iapi.services.stream.HeaderPrintWriter;
Index: java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java
===================================================================
--- java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/stream/BasicGetLogHeader.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.stream;
 
 import org.apache.derby.iapi.services.stream.PrintWriterGetHeader;
Index: java/engine/org/apache/derby/impl/services/stream/SingleStream.java
===================================================================
--- java/engine/org/apache/derby/impl/services/stream/SingleStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/stream/SingleStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.stream
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.stream;
 
 import org.apache.derby.iapi.services.stream.InfoStreams;
Index: java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/TableNameInfo.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/services/locks/LockSet.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/LockSet.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/LockSet.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Latch;
Index: java/engine/org/apache/derby/impl/services/locks/LockSpace.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/LockSpace.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/LockSpace.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/Deadlock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/Deadlock.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/Deadlock.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/SinglePool.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/SinglePool.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/SinglePool.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/services/locks/Constants.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/Constants.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/Constants.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 /**
Index: java/engine/org/apache/derby/impl/services/locks/Control.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/Control.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/Control.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/LockTableVTI.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Latch;
Index: java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/ActiveLock.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/ActiveLock.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/Timeout.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/Timeout.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/Timeout.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.impl.services.locks.TableNameInfo;
Index: java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/D_ActiveLock.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/impl/services/locks/Lock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/Lock.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/Lock.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/LockControl.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/LockControl.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/LockControl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/services/locks/D_Lock.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/D_Lock.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/D_Lock.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/services/locks/D_LockControl.java
===================================================================
--- java/engine/org/apache/derby/impl/services/locks/D_LockControl.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/locks/D_LockControl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.locks
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.locks;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/d_BCValidate.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import java.lang.reflect.*;
Index: java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.classfile.ClassFormatOutput;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCLocalField.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.compiler.LocalField;
Index: java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/Conditional.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/Conditional.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 import org.apache.derby.iapi.services.classfile.VMOpcode;
 
Index: java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCMethodCaller.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 /**
Index: 
java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/VMTypeIdCacheable.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCClass.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCClass.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCClass.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.compiler.ClassBuilder;
Index: java/engine/org/apache/derby/impl/services/bytecode/GClass.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/GClass.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/GClass.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.compiler.ClassBuilder;
Index: java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/OpcodeDebug.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 
Index: java/engine/org/apache/derby/impl/services/bytecode/Type.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/Type.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/Type.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCExpr.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 /**
Index: 
java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCMethodDescriptor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCJava.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCJava.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.compiler.JavaFactory;
Index: java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java
===================================================================
--- java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/services/bytecode/BCUnsupported.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.services.bytecode
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package        org.apache.derby.impl.services.bytecode;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java
===================================================================
--- java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/db/StoreClassFactoryContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.db;
 
 import org.apache.derby.iapi.services.loader.ClassFactoryContext;
Index: java/engine/org/apache/derby/impl/db/BasicDatabase.java
===================================================================
--- java/engine/org/apache/derby/impl/db/BasicDatabase.java     (revision 43386)
+++ java/engine/org/apache/derby/impl/db/BasicDatabase.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.db;
 
 import org.apache.derby.iapi.error.PublicAPI;
Index: java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java
===================================================================
--- java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/db/DatabaseContextImpl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.db
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.db;
 
 import org.apache.derby.iapi.services.context.ContextImpl;
Index: java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirRandomAccessFile.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/io/CPFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/CPFile.java    (revision 43386)
+++ java/engine/org/apache/derby/impl/io/CPFile.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFile;
Index: java/engine/org/apache/derby/impl/io/DirFile4.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirFile4.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirFile4.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/io/URLFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/URLFile.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/io/URLFile.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFile;
Index: java/engine/org/apache/derby/impl/io/InputStreamFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/InputStreamFile.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/io/InputStreamFile.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFactory;
Index: java/engine/org/apache/derby/impl/io/DirFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirFile.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirFile.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFile;
Index: java/engine/org/apache/derby/impl/io/URLStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/io/URLStorageFactory.java (revision 43386)
+++ java/engine/org/apache/derby/impl/io/URLStorageFactory.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/io/CPStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/io/CPStorageFactory.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/io/CPStorageFactory.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/io/DirStorageFactory4.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirStorageFactory4.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirStorageFactory4.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFile;
Index: java/engine/org/apache/derby/impl/io/JarDBFile.java
===================================================================
--- java/engine/org/apache/derby/impl/io/JarDBFile.java (revision 43386)
+++ java/engine/org/apache/derby/impl/io/JarDBFile.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.io.StorageFile;
Index: java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirRandomAccessFile4.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import java.io.File;
Index: java/engine/org/apache/derby/impl/io/BaseStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/io/BaseStorageFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/io/BaseStorageFactory.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.store.raw.data.DataFactory;
Index: java/engine/org/apache/derby/impl/io/JarStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/io/JarStorageFactory.java (revision 43386)
+++ java/engine/org/apache/derby/impl/io/JarStorageFactory.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/io/DirStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/io/DirStorageFactory.java (revision 43386)
+++ java/engine/org/apache/derby/impl/io/DirStorageFactory.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/QualifierUtil.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.store.access.Qualifier;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
      (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericController.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerate.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/TemplateRow.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
       (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/OpenConglomerateScratchSpace.java
       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/BinaryOrderableWrapper.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
      (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericScanController.java
      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
      (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericCostController.java
      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/RowPosition.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/conglomerate/ConglomerateUtil.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.conglomerate
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.conglomerate;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/impl/store/access/UTFQualifier.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/UTFQualifier.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/UTFQualifier.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/StorableFormatId.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/StorableFormatId.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/RllRAMAccessManager.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/SortBuffer.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/sort/ExternalSortFactory.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/MergeSortInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (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.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.store.access.SortInfo;
Index: java/engine/org/apache/derby/impl/store/access/sort/Scan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/Scan.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/Scan.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/MergeScan.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import java.util.Enumeration;
Index: java/engine/org/apache/derby/impl/store/access/sort/Node.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/Node.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/Node.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/NodeAllocator.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 /**
Index: java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/SortBufferScan.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/MergeSort.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/sort/SortBufferRowSource.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/MergeInserter.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import java.util.Vector;
Index: java/engine/org/apache/derby/impl/store/access/sort/SortScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/SortScan.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/SortScan.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/sort/MergeScanRowSource.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.sort
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.sort;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/BackingStoreHashTableFromScan.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/LeafControlRow.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/btree/BTree.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTree.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTree.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 
Index: java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/D_BTreeController.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import java.io.PrintStream;
Index: java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeMaxScan.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/btree/WaitError.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/WaitError.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/WaitError.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 /**
Index: 
java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeRowPosition.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 
Index: java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreePostCommit.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeScanInfo.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.store.access.ScanInfo;
Index: java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/OpenBTree.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BranchRow.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/index/B2IUndo.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/index/B2IFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import java.util.Properties;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IForwardScan.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ICostController.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/index/B2I.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
       (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IStaticCompiledInfo.java
       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2ITableLocking3.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLockingRR.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IController.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import java.io.IOException;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2INoLocking.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/D_B2IController.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.impl.store.access.btree.D_BTreeController;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/index/B2IMaxScan.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking1.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking2.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/index/B2IRowLocking3.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree.index
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree.index;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: 
java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/SearchParameters.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import java.io.PrintStream;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/btree/BTreeForwardScan.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/btree/BTreeCostController.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.btree
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.btree;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/PC_XenaVersion.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/PropertyConglomerate.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/RAMTransaction.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/RAMTransaction.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import java.util.Enumeration;
Index: java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/CacheableConglomerate.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/RAMTransactionContext.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/RAMAccessManager.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.services.cache.Cacheable;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapClassInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.services.io.FormatableInstanceGetter;
Index: java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/OpenHeap.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapController.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapController.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapController.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapScan.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 
Index: java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/D_HeapController.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/access/heap/HeapConglomerateFactory.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapCostController.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapPostCommit.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/store/access/heap/Heap.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/Heap.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/Heap.java       
(working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
 
-
 package org.apache.derby.impl.store.access.heap;
 
 import java.io.ObjectOutput;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapScanInfo.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 import org.apache.derby.iapi.store.access.ScanInfo;
Index: java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/heap/HeapRowLocation.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access.heap
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access.heap;
 
 /**
Index: java/engine/org/apache/derby/impl/store/access/UTF.java
===================================================================
--- java/engine/org/apache/derby/impl/store/access/UTF.java     (revision 43386)
+++ java/engine/org/apache/derby/impl/store/access/UTF.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.access
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.access;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLocking1.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.xact
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/Xact.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/Xact.java  (revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/Xact.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/D_Xact.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLocking3Escalate.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLocking2nohold.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.xact
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/XactContext.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/BeginXact.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.io.FormatIdUtil;
Index: java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/SavePoint.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
Index: java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking2.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/ContainerLocking3.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/XactId.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/XactId.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.io.FormatIdUtil;
Index: 
java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/TransactionTableEntry.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/RowLockingRR.java  
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.xact
-   (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.
-
- */
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.LockFactory;
Index: java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/NoLocking.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.locks.Latch;
Index: java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/EndXact.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.io.FormatIdUtil;
Index: java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/XactFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.reference.Property;
Index: 
java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/XactXAResourceManager.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.xact
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/InternalXact.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/GlobalXactId.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/EscalateContainerKey.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.xact
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.xact;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/impl/store/raw/log/SaveLWMOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/SaveLWMOperation.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/SaveLWMOperation.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/FlushedScan.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/TruncationPoint.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/TruncationPoint.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/TruncationPoint.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
Index: java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/StreamLogScan.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.store.raw.log.LogInstant;
Index: java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/D_FlushedScan.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.impl.store.raw.log.LogCounter;
Index: java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/D_TruncationPoint.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/D_TruncationPoint.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/D_TruncationPoint.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.impl.store.raw.log.LogCounter;
Index: java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/CheckpointOperation.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/FlushedScanHandle.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/ReadOnly.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/FileLogger.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/LogRecord.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/log/Scan.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/Scan.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/Scan.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.iapi.services.diag.Performance;
Index: java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/D_LogToFile.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 import org.apache.derby.impl.store.raw.log.LogCounter;
Index: java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/log/LogAccessFileBuffer.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.log
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.log;
 
 
Index: java/engine/org/apache/derby/impl/store/raw/RawStore.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/RawStore.java   (revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/RawStore.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw;
 
 import org.apache.derby.iapi.services.daemon.DaemonFactory;
Index: java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/MemByteHolder.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java        
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PurgeOperation.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/ContainerOperation.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.io.FormatIdUtil;
Index: java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/UpdateOperation.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/ContainerBasicOperation.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/CopyRowsOperation.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/BasePage.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/BasePage.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java    
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
-
- */
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/LoggableAllocActions.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.AllocationActions;
Index: java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/StoredFieldHeader.java     
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
-
- */
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.RecordHandle;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/InputStreamContainer.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.FileContainer;
Index: java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/RemoveFileOperation.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.Loggable;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/LogicalUndoOperation.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/SyncOnCommit.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerHandle;
Index: java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/AllocExtent.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/NoSpaceOnPage.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpace.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/SetReservedSpaceOperation.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/BaseDataFileFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 
Index: java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/LoggableActions.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.PageActions;
Index: java/engine/org/apache/derby/impl/store/raw/data/PageActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PageActions.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PageActions.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.io.FormatableBitSet;
Index: java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainer.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PageBasicOperation.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/BufferedByteHolderInputStream.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import java.io.InputStream;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/RememberBytesInputStream.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/TempRAFContainer.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BaseContainerHandle;
Index: java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/CachedPage.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PageVersion.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.PageTimeStamp;
Index: java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/FileContainer.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.Property;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PhysicalPageOperation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/TruncateOnCommit.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerHandle;
Index: java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/DirectActions.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/D_StoredPage.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/SpaceInformation.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.access.SpaceInfo;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/ContainerHandleActionOnCommit.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerHandle;
Index: java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/DropOnCommit.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/ChainAllocPageOperation.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.PhysicalPageOperation;
Index: java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/BaseContainer.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/RFResource.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/RFResource.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/RFResource.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/DeleteOperation.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/PhysicalUndoOperation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/ReclaimSpaceHelper.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/BaseContainerHandle.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/RecordId.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/RecordId.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/RecordId.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java   
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/LongColumnException.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: java/engine/org/apache/derby/impl/store/raw/data/RawField.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/RawField.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/RawField.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 public class RawField {
Index: java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/D_RecordId.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/store/raw/data/ByteHolder.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/ByteHolder.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/ByteHolder.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/AllocationActions.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.xact.RawTransaction;
Index: java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/DirectAllocActions.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.AllocationActions;
Index: java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/DecryptInputStream.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/UpdateFieldOperation.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/AllocPageOperation.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.PhysicalPageOperation;
Index: java/engine/org/apache/derby/impl/store/raw/data/AllocationCache.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/AllocationCache.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/AllocationCache.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/StreamFileContainerHandle.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/RAFContainer.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/InitPageOperation.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java       
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/InsertOperation.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java      
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/D_DiagnosticUtil.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/ContainerActionOnCommit.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java     
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java  
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/LogicalPageOperation.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.RecordId;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/ContainerUndoOperation.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/D_BaseContainerHandle.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java    
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java    
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 1997, 2004.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.store.raw.data;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java
===================================================================
--- java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/impl/store/raw/data/ByteHolderInputStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.store.raw.data
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import java.io.InputStream;
Index: 
java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java
===================================================================
--- 
java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/impl/store/raw/data/InvalidatePageOperation.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.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.
 
- */
-
 package org.apache.derby.impl.store.raw.data;
 
 import org.apache.derby.impl.store.raw.data.BasePage;
Index: java/engine/org/apache/derby/osgi/EmbeddedActivator.java
===================================================================
--- java/engine/org/apache/derby/osgi/EmbeddedActivator.java    (revision 43386)
+++ java/engine/org/apache/derby/osgi/EmbeddedActivator.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.osgi
-   (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.
 
- */
-
 package org.apache.derby.osgi;
 
 import java.sql.DriverManager;
Index: java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java
===================================================================
--- java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java   (revision 43386)
+++ java/engine/org/apache/derby/vti/VTIMetaDataTemplate.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/vti/UpdatableVTITemplate.java
===================================================================
--- java/engine/org/apache/derby/vti/UpdatableVTITemplate.java  (revision 43386)
+++ java/engine/org/apache/derby/vti/UpdatableVTITemplate.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import org.apache.derby.iapi.reference.Copyright;
Index: java/engine/org/apache/derby/vti/Pushable.java
===================================================================
--- java/engine/org/apache/derby/vti/Pushable.java      (revision 43386)
+++ java/engine/org/apache/derby/vti/Pushable.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/vti/IFastPath.java
===================================================================
--- java/engine/org/apache/derby/vti/IFastPath.java     (revision 43386)
+++ java/engine/org/apache/derby/vti/IFastPath.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/vti/VTIEnvironment.java
===================================================================
--- java/engine/org/apache/derby/vti/VTIEnvironment.java        (revision 43386)
+++ java/engine/org/apache/derby/vti/VTIEnvironment.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 /**
Index: java/engine/org/apache/derby/vti/IQualifyable.java
===================================================================
--- java/engine/org/apache/derby/vti/IQualifyable.java  (revision 43386)
+++ java/engine/org/apache/derby/vti/IQualifyable.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/vti/VTICosting.java
===================================================================
--- java/engine/org/apache/derby/vti/VTICosting.java    (revision 43386)
+++ java/engine/org/apache/derby/vti/VTICosting.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/vti/DeferModification.java
===================================================================
--- java/engine/org/apache/derby/vti/DeferModification.java     (revision 43386)
+++ java/engine/org/apache/derby/vti/DeferModification.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (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.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/vti/VTITemplate.java
===================================================================
--- java/engine/org/apache/derby/vti/VTITemplate.java   (revision 43386)
+++ java/engine/org/apache/derby/vti/VTITemplate.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.vti
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.vti;
 
 import java.sql.DriverManager;
Index: java/engine/org/apache/derby/iapi/sql/LanguageProperties.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/LanguageProperties.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/LanguageProperties.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/Activation.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/Activation.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/Activation.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/StatementUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/StatementUtil.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/StatementUtil.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/Statement.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/Statement.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/Statement.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/StatementType.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/StatementType.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/StatementType.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/Row.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/Row.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/Row.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/compile/Visitor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/Visitor.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/Visitor.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package        org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicate.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/RowOrdering.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/RequiredRowOrdering.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.store.access.StoreCostResult;
Index: java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/TypeCompilerFactory.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/OptimizerFactory.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/OptimizableList.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/TypeCompiler.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/compile/ExpressionClassBuilderInterface.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/NodeFactory.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/AccessPath.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.services.context.Context;
Index: java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/JoinStrategy.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.DataDictionary;
Index: java/engine/org/apache/derby/iapi/sql/compile/Visitable.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/Visitable.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/Visitable.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/CodeGeneration.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/compile/Parser.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/Parser.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/Parser.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/compile/OptimizablePredicateList.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.compile;
 
 import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/LanguageFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/LanguageFactory.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/LanguageFactory.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.conn;
 
 import org.apache.derby.iapi.services.context.Context;
Index: java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/conn/StatementContext.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.conn;
 
 import org.apache.derby.iapi.services.context.Context;
Index: java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.conn;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/conn/Authorizer.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.conn;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/conn/ConnectionUtil.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.conn;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/iapi/sql/depend/DependableList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/DependableList.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/DependableList.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/ProviderInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/sql/depend/Dependent.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/Dependent.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/Dependent.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.catalog.Dependable;
Index: java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/ProviderList.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/sql/depend/Provider.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/Provider.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/Provider.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.catalog.Dependable;
Index: java/engine/org/apache/derby/iapi/sql/depend/Dependency.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/depend/Dependency.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/depend/Dependency.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.depend;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/ResultDescription.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/ResultDescription.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/ResultDescription.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/TupleFilter.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.types.BooleanDataValue;
Index: java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/CursorActivation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.sql.Activation;
Index: java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/TargetResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecIndexRow.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 /**
Index: java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/TemporaryRowHolder.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecutionContext.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.services.context.Context;
Index: 
java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecCursorTableReference.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecRow.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/NoPutResultSet.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.sql.ResultSet;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecutionStmtValidator.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ScanQualifier.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ConstantAction.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecAggregator.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/CursorResultSet.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.sql.ResultSet;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.sql.Activation;
Index: java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.services.loader.GeneratedClass;
Index: 
java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/execute/ResultSetStatisticsFactory.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/execute/RunTimeStatistics.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.execute;
 
 import java.io.Serializable;
Index: java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/StorablePreparedStatement.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.sql.execute.ExecPreparedStatement;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/SchemaDescriptor.java      
(working copy)
@@ -1,12 +1,18 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 1997, 2004.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT 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.sql.dictionary;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/SystemColumn.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 import org.apache.derby.iapi.error.StandardException;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/SPSDescriptor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionaryContext.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.context.Context;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/SubKeyConstraintDescriptor.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 
Index: java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/IndexRowGenerator.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/GenericDescriptorList.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/DDUtils.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ConsInfo.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptorList.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
     (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/ReferencedKeyConstraintDescriptor.java
     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/UniqueTupleDescriptor.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/CheckConstraintDescriptor.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 import org.apache.derby.catalog.ReferencedColumns;
 import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/TabInfo.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ConstraintDescriptor.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/TableDescriptor.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/AliasDescriptor.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.depend.Provider;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/StatisticsDescriptor.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.catalog.Statistics;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/CatalogRowFactory.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.reference.Property;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/SubCheckConstraintDescriptor.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/SubConstraintDescriptor.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 
Index: java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/TriggerDescriptor.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/RowList.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.types.RowLocation;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/ForeignKeyConstraintDescriptor.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ListOfRowLists.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ViewDescriptor.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptorList.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/UniqueSQLObjectDescriptor.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/DependencyDescriptor.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/ConglomerateDescriptor.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.depend.Provider;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/DataDescriptorGenerator.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/DefaultDescriptor.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.depend.Provider;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/TupleDescriptor.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptorList.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/FileInfoDescriptor.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/IndexLister.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/dictionary/ColumnDescriptor.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: 
java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/sql/dictionary/KeyConstraintDescriptor.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql.dictionary;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/PreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/PreparedStatement.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/PreparedStatement.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/ParameterValueSet.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import java.sql.Date;
Index: java/engine/org/apache/derby/iapi/sql/ResultSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/ResultSet.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/ResultSet.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/sql/ResultColumnDescriptor.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.sql;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/AuthenticationService.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.*;
Index: java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/ConnectionContext.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredCallableStatement30.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.*;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredPreparedStatement30.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.*;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.Connection;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnectionControl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.Connection;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredConnection30.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.Statement;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import org.apache.derby.iapi.reference.JDBC30Translation;
Index: java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/BrokeredStatementControl.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import java.sql.*;
Index: java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/JDBCBoot.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
===================================================================
--- java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.jdbc;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/i18n/BundleFinder.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.i18n;
 
 import java.util.ResourceBundle;
Index: java/engine/org/apache/derby/iapi/services/i18n/MessageService.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/i18n/MessageService.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/i18n/MessageService.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.i18n;
 
 import org.apache.derby.iapi.services.info.JVMInfo;
Index: java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/i18n/LocaleFinder.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.i18n;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/crypto/CipherFactory.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.crypto;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/crypto/CipherProvider.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.crypto;
 
 import java.security.Key;
Index: 
java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/property/PropertyValidation.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.property;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/property/PropertyUtil.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.property;
 
 import org.apache.derby.iapi.reference.Property;
Index: java/engine/org/apache/derby/iapi/services/property/PersistentSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/property/PersistentSet.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/property/PersistentSet.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.property;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/property/PropertyFactory.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.property;
 
 import org.apache.derby.catalog.UUID;
Index: 
java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/property/PropertySetCallback.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.property;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/context/ContextManager.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/ContextManager.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/ContextManager.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/context/Context.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/Context.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/Context.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/context/ContextService.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/ContextService.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/ContextService.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/iapi/services/context/ContextImpl.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/ContextImpl.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/ContextImpl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/ErrorStringBuilder.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/context/SystemContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/SystemContext.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/SystemContext.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/context/ShutdownException.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/context/ShutdownException.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/context/ShutdownException.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.context;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/monitor/PersistentService.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.monitor;
 
 import org.apache.derby.io.StorageFactory;
Index: java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/monitor/ModuleSupportable.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.monitor;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/monitor/ModuleControl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.monitor;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/services/monitor/Monitor.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/monitor/Monitor.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/monitor/Monitor.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.monitor;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/monitor/ModuleFactory.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.monitor;
 
 import org.apache.derby.iapi.services.info.ProductVersionHolder;
Index: java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/stream/HeaderPrintWriter.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.stream;
 
 import java.io.PrintWriter;
Index: 
java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/stream/PrintWriterGetHeader.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.stream;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/stream/InfoStreams.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.stream;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java   
(working copy)
@@ -1,14 +1,21 @@
-/* IBM Confidential
+/*
+ * Copyright  2001-2004 The Apache Software Foundation
  *
- * Product ID: 5697-F53
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * (C) Copyright IBM Corp. 1998, 2004.
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- * The source code for this program is not published or otherwise divested
- * of its trade secrets, irrespective of what has been deposited with the
- * U.S. Copyright Office.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT 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.info;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/info/ProductGenusNames.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.info;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/info/PropertyNames.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/info/PropertyNames.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/info/PropertyNames.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.info;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/info/JVMInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/info/JVMInfo.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/info/JVMInfo.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.info;
 
 
Index: java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/daemon/DaemonService.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.daemon;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/daemon/Serviceable.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.daemon;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/daemon/DaemonFactory.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.daemon;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/CacheableFactory.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/cache/ClassSize.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/ClassSize.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/ClassSize.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/SizedCacheable.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/cache/Cacheable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/Cacheable.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/Cacheable.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/CacheFactory.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/cache/CacheManager.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/cache/CacheManager.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/cache/CacheManager.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.cache;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/diag/Performance.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/diag/Performance.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/diag/Performance.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.diag;
 
 public abstract class Performance {
Index: java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/diag/DiagnosticUtil.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.diag;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/diag/DiagnosticableGeneric.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.diag;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/diag/Diagnosticable.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.diag;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassFormatOutput.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.io.AccessibleByteArrayOutputStream;
Index: java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassHolder.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassInvestigator.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 
Index: 
java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ConstantPoolEntry.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Utf8_info.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/VMOpcode.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassEnumeration.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.util.Enumeration;
Index: java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/MemberTable.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.io.IOException;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Integer_info.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/VMDescriptor.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 public interface VMDescriptor {
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Long_info.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/AttributeEntry.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassInput.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/classfile/Attributes.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/Attributes.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/Attributes.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.util.Vector;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Float_info.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Index_info.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/classfile/ClassMember.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import java.lang.reflect.Modifier;
Index: 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/classfile/CONSTANT_Double_info.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.classfile;
 
 import org.apache.derby.iapi.services.classfile.VMDescriptor;
Index: java/engine/org/apache/derby/iapi/services/loader/JarReader.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/JarReader.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/JarReader.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/GeneratedMethod.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/InstanceGetter.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import java.lang.reflect.InvocationTargetException;
Index: java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/ClassInfo.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import java.lang.reflect.Constructor;
Index: 
java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/ClassFactoryContext.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.services.context.ContextImpl;
Index: java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/GeneratedClass.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/ClassInspector.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/GeneratedByteCode.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/loader/ClassFactory.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.loader;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/uuid/UUIDFactory.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.uuid;
 
 import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/sanity/SanityManager.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.sanity;
 
 
Index: java/engine/org/apache/derby/iapi/services/sanity/SanityState.tmpl
===================================================================
--- java/engine/org/apache/derby/iapi/services/sanity/SanityState.tmpl  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/sanity/SanityState.tmpl  
(working copy)
@@ -1,13 +1,30 @@
 package org.apache.derby.iapi.services.sanity;
 
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+
+/*
  **
  * This class is intended for the use of the SanityManager in conjunction
  * with making a build either Sane or Insane. An insane build is one which
  * has the two booleans expressed here as "false"; a sane build should be
  * have the booleans expressed as "true".
  *
- * @see com.ihost.cs.iapi.services.sanity.SanityManager
+ * @see org.apache.derby.iapi.services.sanity.SanityManager
  ** 
 */
 
Index: java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/sanity/AssertFailure.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.sanity;
 
 import java.io.*;
Index: java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/ErrorObjectInput.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.ObjectInput;
Index: java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatIdInputStream.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.DataInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatIdOutputStream.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatIdUtil.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.DataInput;
Index: java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/RegisteredFormatIds.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.*;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableArrayHolder.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/StoredFormatIds.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 //depot/main/java/org.apache.derby.iapi.services.io/StoredFormatIds.java#211 - 
edit change 20974 (text)
 package org.apache.derby.iapi.services.io;
 /**
Index: java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/CounterOutputStream.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.OutputStream;
Index: 
java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableInstanceGetter.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.loader.InstanceGetter;
Index: java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableIntHolder.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/LimitObjectInput.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.Limit;
Index: java/engine/org/apache/derby/iapi/services/io/StreamStorable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/StreamStorable.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/StreamStorable.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 import org.apache.derby.iapi.error.StandardException;
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableHashtable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableProperties.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/LimitReader.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/LimitReader.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/LimitReader.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.Reader;
Index: 
java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/DebugByteTeeOutputStream.java 
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
-
- */
 package org.apache.derby.iapi.services.io;
 
 import java.io.*;
Index: java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/ErrorInfo.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/NullOutputStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.OutputStream;
Index: 
java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/NewByteArrayInputStream.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/LimitInputStream.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/ArrayOutputStream.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/iapi/services/io/Storable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/Storable.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/Storable.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.lang.ClassNotFoundException;
Index: java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/ArrayUtil.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/io/Formatable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/Formatable.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/Formatable.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.Externalizable;
Index: 
java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/io/AccessibleByteArrayOutputStream.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.ByteArrayOutputStream;
Index: java/engine/org/apache/derby/iapi/services/io/FileUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FileUtil.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FileUtil.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.io.StorageFactory;
Index: java/engine/org/apache/derby/iapi/services/io/Limit.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/Limit.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/Limit.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/SQLExceptionWrapper.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: 
java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/services/io/ApplicationObjectInputStream.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/FormatableLongHolder.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/services/io/TypedFormat.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/io/TypedFormat.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/io/TypedFormat.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.io;
 /**
   Cloudscape interface for identifying the format id for the
Index: java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.compiler;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/compiler/JavaFactory.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.compiler;
 
 import org.apache.derby.iapi.services.loader.ClassFactory;
Index: java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/compiler/ClassBuilder.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.compiler;
 
 import org.apache.derby.iapi.services.loader.GeneratedClass;
Index: java/engine/org/apache/derby/iapi/services/compiler/LocalField.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/compiler/LocalField.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/compiler/LocalField.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.compiler;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/locks/LockFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/LockFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/LockFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 import org.apache.derby.iapi.util.Matchable;
Index: java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/C_LockFactory.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/ShExLockable.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/VirtualLockTable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/locks/ShExQual.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/ShExQual.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/ShExQual.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/locks/Latch.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/Latch.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/Latch.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 /**
Index: java/engine/org/apache/derby/iapi/services/locks/Lockable.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/Lockable.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/Lockable.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 import java.util.Hashtable;
Index: java/engine/org/apache/derby/iapi/services/locks/Limit.java
===================================================================
--- java/engine/org/apache/derby/iapi/services/locks/Limit.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/services/locks/Limit.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.services.locks;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/RowLocation.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/RowLocation.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/RowLocation.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLReal.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLReal.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLReal.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/UserDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/UserDataValue.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/UserDataValue.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataTypeUtilities.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/DateTimeParser.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DateTimeParser.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DateTimeParser.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/CloneableObject.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/CloneableObject.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/CloneableObject.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 /**
Index: java/engine/org/apache/derby/iapi/types/JSQLType.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/JSQLType.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/JSQLType.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLNationalLongvarchar.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLDecimal.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLDecimal.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLDecimal.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/NumberDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/NumberDataValue.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/NumberDataValue.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DateTimeDataValue.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLNationalChar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLNationalChar.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLNationalChar.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/Like.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/Like.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/Like.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 // RESOLVE: MOVE THIS CLASS TO PROTOCOL (See LikeOperatorNode)
Index: java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLLongvarchar.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLLongint.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLLongint.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLLongint.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLNationalVarchar.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLDate.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLDate.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLDate.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.SQLInteger;
Index: java/engine/org/apache/derby/iapi/types/SQLChar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLChar.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLChar.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.context.ContextService;
Index: java/engine/org/apache/derby/iapi/types/SQLBlob.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLBlob.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLBlob.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/TypeId.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/TypeId.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/TypeId.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/types/Orderable.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/Orderable.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/Orderable.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLBoolean.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLBoolean.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLBoolean.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/SQLClob.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLClob.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLClob.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/RefDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/RefDataValue.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/RefDataValue.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.RowLocation;
Index: java/engine/org/apache/derby/iapi/types/SQLSmallint.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLSmallint.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLSmallint.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/SQLBinary.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLBinary.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLBinary.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/BitDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/BitDataValue.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/BitDataValue.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/types/BooleanDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/BooleanDataValue.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/BooleanDataValue.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/Resetable.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/Resetable.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/Resetable.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLVarchar.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLVarchar.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLVarchar.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/VariableSizeDataValue.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLVarbit.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLVarbit.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLVarbit.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/types/DataType.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataType.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataType.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/iapi/types/SQLNClob.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLNClob.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLNClob.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLInteger.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLInteger.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLInteger.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/types/SQLTinyint.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLTinyint.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLTinyint.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/SQLTime.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLTime.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLTime.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/UserType.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/UserType.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/UserType.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.catalog.TypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataValueFactoryImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/ConcatableDataValue.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLTimestamp.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLTimestamp.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/NumberDataType.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/NumberDataType.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/NumberDataType.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLLongVarbit.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.DataTypeDescriptor;
Index: java/engine/org/apache/derby/iapi/types/SQLDouble.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLDouble.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLDouble.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/types/DTSClassInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DTSClassInfo.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DTSClassInfo.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/iapi/types/SQLRef.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLRef.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLRef.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.services.io.ArrayInputStream;
Index: java/engine/org/apache/derby/iapi/types/StringDataValue.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/StringDataValue.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/StringDataValue.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/types/DataValueFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/DataValueFactory.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/types/DataValueFactory.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.types.TypeId;
Index: java/engine/org/apache/derby/iapi/types/SQLBit.java
===================================================================
--- java/engine/org/apache/derby/iapi/types/SQLBit.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/types/SQLBit.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.types;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/db/PropertyInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/PropertyInfo.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/PropertyInfo.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/db/OptimizerTrace.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/OptimizerTrace.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/OptimizerTrace.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/iapi/db/Database.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/Database.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/Database.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/db/ConsistencyChecker.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/db/Factory.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/Factory.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/Factory.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/iapi/db/DatabaseContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/DatabaseContext.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/DatabaseContext.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.services.context.Context;
Index: java/engine/org/apache/derby/iapi/db/ConnectionInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/ConnectionInfo.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/db/ConnectionInfo.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import org.apache.derby.iapi.sql.conn.LanguageConnectionContext;
Index: java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java
===================================================================
--- java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/db/TriggerExecutionContext.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.db;
 
 import java.sql.ResultSet;
Index: java/engine/org/apache/derby/iapi/error/StandardException.java
===================================================================
--- java/engine/org/apache/derby/iapi/error/StandardException.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/error/StandardException.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.error;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/error/PassThroughException.java
===================================================================
--- java/engine/org/apache/derby/iapi/error/PassThroughException.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/error/PassThroughException.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.error;
 
 public final class PassThroughException extends RuntimeException {
Index: java/engine/org/apache/derby/iapi/error/PublicAPI.java
===================================================================
--- java/engine/org/apache/derby/iapi/error/PublicAPI.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/error/PublicAPI.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.error;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java
===================================================================
--- java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/error/ExceptionSeverity.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.error;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/SortFactory.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import java.util.Properties;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java   
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/Conglomerate.java   
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanManager.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.store.access.GroupFetchScanController;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
 (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/TransactionManager.java
 (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.services.daemon.Serviceable;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/LogicalUndo.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ScanControllerRowSource.java
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.store.access.RowLocationRetRowSource;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
        (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/ConglomerateFactory.java
        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/conglomerate/Sort.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java  
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/conglomerate/MethodFactory.java  
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.conglomerate;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/store/access/SortObserver.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/SortObserver.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/SortObserver.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/TransactionInfo.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 public interface TransactionInfo
Index: java/engine/org/apache/derby/iapi/store/access/SortInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/SortInfo.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/SortInfo.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.Orderable;
Index: java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import java.io.Serializable;
Index: java/engine/org/apache/derby/iapi/store/access/RowUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/RowUtil.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/RowUtil.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/SpaceInfo.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 /**
Index: 
java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/ConglomPropertyQueryable.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: java/engine/org/apache/derby/iapi/store/access/GlobalXact.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/GlobalXact.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/GlobalXact.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 
Index: 
java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
   (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/StaticCompiledOpenConglomInfo.java
   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: 
java/engine/org/apache/derby/iapi/store/access/XATransactionController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/XATransactionController.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/XATransactionController.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: 
java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.store.access.RowUtil;
Index: 
java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/RowLocationRetRowSource.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/GenericScanController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/GenericScanController.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/GenericScanController.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.io.Storable;
Index: java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/ColumnOrdering.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/RowSource.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/RowSource.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/RowSource.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/xa/XAXactId.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.xa;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/xa/XAResourceManager.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access.xa;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/store/access/ScanController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/ScanController.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/ScanController.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.io.Storable;
Index: java/engine/org/apache/derby/iapi/store/access/StoreCostController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/StoreCostController.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/StoreCostController.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/store/access/ScanInfo.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/ScanInfo.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/ScanInfo.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/RowCountable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/RowCountable.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/RowCountable.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: 
java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
  (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/DynamicCompiledOpenConglomInfo.java
  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: 
java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
===================================================================
--- 
java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java    
    (revision 43386)
+++ 
java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java    
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.io.Storable;
Index: java/engine/org/apache/derby/iapi/store/access/Qualifier.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/Qualifier.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/Qualifier.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.DataValueDescriptor;
Index: java/engine/org/apache/derby/iapi/store/access/KeyHasher.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/KeyHasher.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/KeyHasher.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/store/access/SortCostController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/SortCostController.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/SortCostController.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException; 
Index: java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/StoreCostResult.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/access/FileResource.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/FileResource.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/FileResource.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/store/access/AccessFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/AccessFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/AccessFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.catalog.UUID;
Index: java/engine/org/apache/derby/iapi/store/access/TransactionController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/TransactionController.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/TransactionController.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/store/access/SortController.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/SortController.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/SortController.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 import org.apache.derby.iapi.types.CloneableObject;
Index: java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/access/AccessFactoryGlobals.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.access;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/Compensation.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Compensation.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Compensation.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/ScanHandle.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/PageTimeStamp.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/log/Logger.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/log/Logger.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/log/Logger.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.log;
 
 import org.apache.derby.iapi.store.raw.RawStoreFactory;
Index: java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/log/LogInstant.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.log;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/log/LogScan.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.log;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/log/LogFactory.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.log;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/RePreparable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/RePreparable.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/RePreparable.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.store.raw.LockingPolicy;
Index: java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/LockingPolicy.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.locks.Latch;
Index: java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/StreamContainerHandle.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/Loggable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Loggable.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Loggable.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/store/raw/Page.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Page.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Page.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.io.FormatableBitSet;
Index: java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/xact/RawTransaction.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.xact;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java 
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/xact/TransactionId.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.xact;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/xact/TransactionFactory.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.xact;
 
 import org.apache.derby.iapi.services.context.ContextManager;
Index: java/engine/org/apache/derby/iapi/store/raw/RowLock.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/RowLock.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/RowLock.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/Corruptable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Corruptable.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Corruptable.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/D_RowLock.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/GlobalTransactionId.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/LogicalUndoable.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/AuxObject.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/AuxObject.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/AuxObject.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/PageKey.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/PageKey.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/PageKey.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/iapi/store/raw/Transaction.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Transaction.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Transaction.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.daemon.Serviceable;
Index: java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/FetchDescriptor.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/store/raw/Undoable.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/Undoable.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/Undoable.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/data/DataFactory.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerKey;
Index: java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/data/RawContainerHandle.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw.data;
 
 import org.apache.derby.iapi.store.raw.ContainerHandle;
Index: java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/RecordHandle.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.locks.Lockable;
Index: java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 /**
Index: java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java       
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/ContainerKey.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.util.Matchable;
Index: java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java   
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/ScannedTransactionHandle.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.error.StandardException;
Index: java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/D_ContainerLock.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.diag.Diagnosticable;
Index: java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java     
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/D_ContainerKey.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.diag.DiagnosticableGeneric;
Index: java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/ContainerHandle.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.store.access.SpaceInfo;
Index: java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java    
(revision 43386)
+++ java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.store.raw;
 
 import org.apache.derby.iapi.services.daemon.DaemonService;
Index: java/engine/org/apache/derby/iapi/util/Matchable.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/Matchable.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/Matchable.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 /**
Index: java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java      
(revision 43386)
+++ java/engine/org/apache/derby/iapi/util/CheapDateFormatter.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 /**
Index: java/engine/org/apache/derby/iapi/util/ByteArray.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/ByteArray.java       (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/ByteArray.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 import java.io.ObjectOutput;
Index: java/engine/org/apache/derby/iapi/util/PropertyUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/PropertyUtil.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/PropertyUtil.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/util/JBitSet.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/JBitSet.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/JBitSet.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/iapi/util/StringUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/StringUtil.java      (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/StringUtil.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 import java.util.Locale;
 
Index: java/engine/org/apache/derby/iapi/util/DoubleProperties.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/DoubleProperties.java        
(revision 43386)
+++ java/engine/org/apache/derby/iapi/util/DoubleProperties.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 import java.util.Properties;
Index: java/engine/org/apache/derby/iapi/util/IdUtil.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/IdUtil.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/IdUtil.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 import org.apache.derby.iapi.reference.SQLState;
Index: java/engine/org/apache/derby/iapi/util/Operator.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/Operator.java        (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/Operator.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 /**
Index: java/engine/org/apache/derby/iapi/util/ReuseFactory.java
===================================================================
--- java/engine/org/apache/derby/iapi/util/ReuseFactory.java    (revision 43386)
+++ java/engine/org/apache/derby/iapi/util/ReuseFactory.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.util;
 
 /**
Index: java/engine/org/apache/derby/iapi/reference/SQLState.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/SQLState.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/SQLState.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 
Index: java/engine/org/apache/derby/iapi/reference/MessageId.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/MessageId.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/MessageId.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 /**
Index: java/engine/org/apache/derby/iapi/reference/ContextId.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/ContextId.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/ContextId.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 public interface ContextId {
Index: java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/JDBC20Translation.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 import java.sql.ResultSet;
Index: java/engine/org/apache/derby/iapi/reference/Attribute.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/Attribute.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/Attribute.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 
Index: java/engine/org/apache/derby/iapi/reference/Property.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/Property.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/Property.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 /**
Index: java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java  
(revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/JDBC30Translation.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 import java.sql.DatabaseMetaData;
 import java.sql.ParameterMetaData;
Index: java/engine/org/apache/derby/iapi/reference/Module.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/Module.java     (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/Module.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 public interface Module {
Index: java/engine/org/apache/derby/iapi/reference/ClassName.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/ClassName.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/ClassName.java  (working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
 
-
 package org.apache.derby.iapi.reference;
 
 
Index: java/engine/org/apache/derby/iapi/reference/DB2Limit.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/DB2Limit.java   (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/DB2Limit.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 public interface DB2Limit
Index: java/engine/org/apache/derby/iapi/reference/EngineType.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/EngineType.java (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/EngineType.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 
Index: java/engine/org/apache/derby/iapi/reference/Copyright.java
===================================================================
--- java/engine/org/apache/derby/iapi/reference/Copyright.java  (revision 43386)
+++ java/engine/org/apache/derby/iapi/reference/Copyright.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   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.
 
- */
-
 package org.apache.derby.iapi.reference;
 
 
Index: java/engine/org/apache/derby/jdbc/XATransactionState.java
===================================================================
--- java/engine/org/apache/derby/jdbc/XATransactionState.java   (revision 43386)
+++ java/engine/org/apache/derby/jdbc/XATransactionState.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 
Index: java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java        
(revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbedPooledConnection.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java   (revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbeddedDataSource.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/jdbc/EmbeddedDriver.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbeddedDriver.java       (revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbeddedDriver.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import java.sql.DriverManager;
Index: java/engine/org/apache/derby/jdbc/EmbedXAConnection.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbedXAConnection.java    (revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbedXAConnection.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.store.access.xa.XAXactId;
Index: java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java
===================================================================
--- java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java  (revision 43386)
+++ java/engine/org/apache/derby/jdbc/ResourceAdapterImpl.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.services.info.JVMInfo;
Index: java/engine/org/apache/derby/jdbc/Driver169.java
===================================================================
--- java/engine/org/apache/derby/jdbc/Driver169.java    (revision 43386)
+++ java/engine/org/apache/derby/jdbc/Driver169.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java
===================================================================
--- java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java      
(revision 43386)
+++ java/engine/org/apache/derby/jdbc/ReferenceableDataSource.java      
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
-
- */
 package org.apache.derby.jdbc;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/jdbc/Driver20.java
===================================================================
--- java/engine/org/apache/derby/jdbc/Driver20.java     (revision 43386)
+++ java/engine/org/apache/derby/jdbc/Driver20.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.reference.Attribute;
Index: java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java (revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbeddedXADataSource.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.reference.MessageId;
Index: java/engine/org/apache/derby/jdbc/XAStatementControl.java
===================================================================
--- java/engine/org/apache/derby/jdbc/XAStatementControl.java   (revision 43386)
+++ java/engine/org/apache/derby/jdbc/XAStatementControl.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.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.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.iapi.jdbc.BrokeredConnection;
Index: java/engine/org/apache/derby/jdbc/Driver30.java
===================================================================
--- java/engine/org/apache/derby/jdbc/Driver30.java     (revision 43386)
+++ java/engine/org/apache/derby/jdbc/Driver30.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.jdbc;
 
 import org.apache.derby.impl.jdbc.EmbedConnection;
Index: java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
===================================================================
--- java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java     
(revision 43386)
+++ java/engine/org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.jdbc
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.jdbc;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/database/UserUtility.java
===================================================================
--- java/engine/org/apache/derby/database/UserUtility.java      (revision 43386)
+++ java/engine/org/apache/derby/database/UserUtility.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.database
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.database;
 import org.apache.derby.iapi.db.PropertyInfo;
 import org.apache.derby.iapi.store.access.TransactionController;
Index: java/engine/org/apache/derby/database/Database.java
===================================================================
--- java/engine/org/apache/derby/database/Database.java (revision 43386)
+++ java/engine/org/apache/derby/database/Database.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.database
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.database;
 
 /*
Index: java/engine/org/apache/derby/diag/LockTable.java
===================================================================
--- java/engine/org/apache/derby/diag/LockTable.java    (revision 43386)
+++ java/engine/org/apache/derby/diag/LockTable.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 // temp
Index: java/engine/org/apache/derby/diag/ErrorMessages.java
===================================================================
--- java/engine/org/apache/derby/diag/ErrorMessages.java        (revision 43386)
+++ java/engine/org/apache/derby/diag/ErrorMessages.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import java.util.Hashtable;
Index: java/engine/org/apache/derby/diag/SpaceTable.java
===================================================================
--- java/engine/org/apache/derby/diag/SpaceTable.java   (revision 43386)
+++ java/engine/org/apache/derby/diag/SpaceTable.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/diag/StatementCache.java
===================================================================
--- java/engine/org/apache/derby/diag/StatementCache.java       (revision 43386)
+++ java/engine/org/apache/derby/diag/StatementCache.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2002, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import org.apache.derby.vti.VTITemplate;
Index: java/engine/org/apache/derby/diag/StatementDuration.java
===================================================================
--- java/engine/org/apache/derby/diag/StatementDuration.java    (revision 43386)
+++ java/engine/org/apache/derby/diag/StatementDuration.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import java.io.BufferedReader;
Index: java/engine/org/apache/derby/diag/TransactionTable.java
===================================================================
--- java/engine/org/apache/derby/diag/TransactionTable.java     (revision 43386)
+++ java/engine/org/apache/derby/diag/TransactionTable.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import org.apache.derby.iapi.services.monitor.Monitor;
Index: java/engine/org/apache/derby/diag/ErrorLogReader.java
===================================================================
--- java/engine/org/apache/derby/diag/ErrorLogReader.java       (revision 43386)
+++ java/engine/org/apache/derby/diag/ErrorLogReader.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.diag
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.diag;
 
 import java.io.BufferedReader;
Index: java/engine/org/apache/derby/io/StorageFile.java
===================================================================
--- java/engine/org/apache/derby/io/StorageFile.java    (revision 43386)
+++ java/engine/org/apache/derby/io/StorageFile.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.io;
 
 import java.io.InputStream;
Index: java/engine/org/apache/derby/io/WritableStorageFactory.java
===================================================================
--- java/engine/org/apache/derby/io/WritableStorageFactory.java (revision 43386)
+++ java/engine/org/apache/derby/io/WritableStorageFactory.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.io;
 
 import java.io.OutputStream;
Index: java/engine/org/apache/derby/io/StorageRandomAccessFile.java
===================================================================
--- java/engine/org/apache/derby/io/StorageRandomAccessFile.java        
(revision 43386)
+++ java/engine/org/apache/derby/io/StorageRandomAccessFile.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.io;
 
 import java.io.DataInput;
Index: java/engine/org/apache/derby/io/StorageFactory.java
===================================================================
--- java/engine/org/apache/derby/io/StorageFactory.java (revision 43386)
+++ java/engine/org/apache/derby/io/StorageFactory.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.io
-   (C) Copyright IBM Corp. 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.io;
 
 import java.io.IOException;
Index: java/engine/org/apache/derby/catalog/DefaultInfo.java
===================================================================
--- java/engine/org/apache/derby/catalog/DefaultInfo.java       (revision 43386)
+++ java/engine/org/apache/derby/catalog/DefaultInfo.java       (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java
===================================================================
--- java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java  
(revision 43386)
+++ java/engine/org/apache/derby/catalog/TriggerNewTransitionRows.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 import org.apache.derby.iapi.db.Factory;
Index: java/engine/org/apache/derby/catalog/ReferencedColumns.java
===================================================================
--- java/engine/org/apache/derby/catalog/ReferencedColumns.java (revision 43386)
+++ java/engine/org/apache/derby/catalog/ReferencedColumns.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 
Index: java/engine/org/apache/derby/catalog/AliasInfo.java
===================================================================
--- java/engine/org/apache/derby/catalog/AliasInfo.java (revision 43386)
+++ java/engine/org/apache/derby/catalog/AliasInfo.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/UUID.java
===================================================================
--- java/engine/org/apache/derby/catalog/UUID.java      (revision 43386)
+++ java/engine/org/apache/derby/catalog/UUID.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/IndexDescriptor.java
===================================================================
--- java/engine/org/apache/derby/catalog/IndexDescriptor.java   (revision 43386)
+++ java/engine/org/apache/derby/catalog/IndexDescriptor.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/DependableFinder.java
===================================================================
--- java/engine/org/apache/derby/catalog/DependableFinder.java  (revision 43386)
+++ java/engine/org/apache/derby/catalog/DependableFinder.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 import java.sql.SQLException;
Index: java/engine/org/apache/derby/catalog/SystemProcedures.java
===================================================================
--- java/engine/org/apache/derby/catalog/SystemProcedures.java  (revision 43386)
+++ java/engine/org/apache/derby/catalog/SystemProcedures.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 import org.apache.derby.iapi.services.sanity.SanityManager;
Index: java/engine/org/apache/derby/catalog/TypeDescriptor.java
===================================================================
--- java/engine/org/apache/derby/catalog/TypeDescriptor.java    (revision 43386)
+++ java/engine/org/apache/derby/catalog/TypeDescriptor.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/Dependable.java
===================================================================
--- java/engine/org/apache/derby/catalog/Dependable.java        (revision 43386)
+++ java/engine/org/apache/derby/catalog/Dependable.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1997, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java   
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/DecimalTypeIdImpl.java   
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import java.io.ObjectOutput;
Index: java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java  
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java     
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/DefaultInfoImpl.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: 
java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java
===================================================================
--- 
java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java 
    (revision 43386)
+++ 
java/engine/org/apache/derby/catalog/types/ReferencedColumnsDescriptorImpl.java 
    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 
Index: java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java     
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/MethodAliasInfo.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java     
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/TypesImplInstanceGetter.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java 
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/IndexDescriptorImpl.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.catalog.IndexDescriptor;
Index: java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java    
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java    
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2003, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.Formatable;
Index: java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/BaseTypeIdImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.catalog.TypeDescriptor;
Index: java/engine/org/apache/derby/catalog/types/StatisticsImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/StatisticsImpl.java      
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/StatisticsImpl.java      
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.catalog.Statistics;
Index: java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java
===================================================================
--- java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java       
(revision 43386)
+++ java/engine/org/apache/derby/catalog/types/UserDefinedTypeIdImpl.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog.types
-   (C) Copyright IBM Corp. 1998, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog.types;
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
Index: java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java
===================================================================
--- java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java  
(revision 43386)
+++ java/engine/org/apache/derby/catalog/TriggerOldTransitionRows.java  
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 1999, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 import org.apache.derby.iapi.db.Factory;
Index: java/engine/org/apache/derby/catalog/GetProcedureColumns.java
===================================================================
--- java/engine/org/apache/derby/catalog/GetProcedureColumns.java       
(revision 43386)
+++ java/engine/org/apache/derby/catalog/GetProcedureColumns.java       
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2000, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 import java.sql.Types;
Index: java/engine/org/apache/derby/catalog/Statistics.java
===================================================================
--- java/engine/org/apache/derby/catalog/Statistics.java        (revision 43386)
+++ java/engine/org/apache/derby/catalog/Statistics.java        (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.catalog
-   (C) Copyright IBM Corp. 2001, 2004. All Rights Reserved.
-   US Government Users Restricted Rights - Use, duplication or
-   disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
 
- */
-
 package org.apache.derby.catalog;
 
 /**
Index: java/drda/org/apache/derby/impl/drda/DRDAStatement.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAStatement.java     (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DRDAStatement.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.lang.reflect.*;
Index: java/drda/org/apache/derby/impl/drda/DDMWriter.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DDMWriter.java (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DDMWriter.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.io.OutputStream;
Index: java/drda/org/apache/derby/impl/drda/TestProto.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/TestProto.java (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/TestProto.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.io.IOException;
Index: java/drda/org/apache/derby/impl/drda/Database.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/Database.java  (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/Database.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.sql.Connection;
Index: java/drda/org/apache/derby/impl/drda/ClientThread.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/ClientThread.java      (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/ClientThread.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.io.*;
Index: java/drda/org/apache/derby/impl/drda/DssTrace.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DssTrace.java  (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DssTrace.java  (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 // Generic process and error tracing encapsulation.
Index: java/drda/org/apache/derby/impl/drda/FdocaConstants.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/FdocaConstants.java    (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/FdocaConstants.java    (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 import java.sql.Types;
Index: java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java        
(revision 43386)
+++ java/drda/org/apache/derby/impl/drda/EbcdicCcsidManager.java        
(working copy)
@@ -1,16 +1,18 @@
 /*
-
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
-   This program and the accompanying materials 
-   are made available under the terms of the Common Public License v1.0
-   which accompanies this distribution, and is available at
-   http://www.ibm.com/developerworks/oss/CPLv1.0.htm
-
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 package org.apache.derby.impl.drda;
Index: java/drda/org/apache/derby/impl/drda/DecryptionManager.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DecryptionManager.java (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DecryptionManager.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.security.KeyPairGenerator;
Index: java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java     
(revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DRDAProtocolException.java     
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 /*
 
 /**
Index: java/drda/org/apache/derby/impl/drda/memCheck.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/memCheck.java  (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/memCheck.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.util.Date;
Index: java/drda/org/apache/derby/impl/drda/SignedBinary.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/SignedBinary.java      (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/SignedBinary.java      (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.iapi.services.cache
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 /**
Index: java/drda/org/apache/derby/impl/drda/TestFile.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/TestFile.java  (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/TestFile.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 
Index: java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAConnThread.java    (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DRDAConnThread.java    (working copy)
@@ -1,17 +1,24 @@
 /*
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
  */
 
 /**
  * This class translates DRDA protocol from an application requester to JDBC
  * for Cloudscape and then translates the results from Cloudscape to DRDA
  * for return to the application requester.
- * @author ge, marsden, peachey
  */
 package org.apache.derby.impl.drda;
 
Index: java/drda/org/apache/derby/impl/drda/CcsidManager.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/CcsidManager.java      (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/CcsidManager.java      (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 // Peforms character conversions.
Index: java/drda/org/apache/derby/impl/drda/AppRequester.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/AppRequester.java      (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/AppRequester.java      (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.reference.DB2Limit;
Index: java/drda/org/apache/derby/impl/drda/Session.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/Session.java   (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/Session.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.io.IOException;
Index: java/drda/org/apache/derby/impl/drda/CodePoint.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/CodePoint.java (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/CodePoint.java (working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 // TBD:
Index: java/drda/org/apache/derby/impl/drda/SQLTypes.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/SQLTypes.java  (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/SQLTypes.java  (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.sql.Types;
Index: java/drda/org/apache/derby/impl/drda/DRDAResultSet.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAResultSet.java     (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DRDAResultSet.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.lang.reflect.*;
Index: java/drda/org/apache/derby/impl/drda/CharacterEncodings.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/CharacterEncodings.java        
(revision 43386)
+++ java/drda/org/apache/derby/impl/drda/CharacterEncodings.java        
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 public final class CharacterEncodings
Index: java/drda/org/apache/derby/impl/drda/DssConstants.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DssConstants.java      (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DssConstants.java      (working copy)
@@ -1,14 +1,22 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
 
-
 package org.apache.derby.impl.drda;
 
 /**
Index: java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java 
(revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DRDAProtocolExceptionInfo.java 
(working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 public class DRDAProtocolExceptionInfo {
Index: java/drda/org/apache/derby/impl/drda/DDMReader.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DDMReader.java (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DDMReader.java (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import java.io.IOException;
Index: java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java    (revision 43386)
+++ java/drda/org/apache/derby/impl/drda/DB2jServerImpl.java    (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
 
- */
-
 package org.apache.derby.impl.drda;
 
 import java.io.IOException;
Index: java/drda/org/apache/derby/impl/drda/CodePointNameTable.java
===================================================================
--- java/drda/org/apache/derby/impl/drda/CodePointNameTable.java        
(revision 43386)
+++ java/drda/org/apache/derby/impl/drda/CodePointNameTable.java        
(working copy)
@@ -1,12 +1,20 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.impl.drda
-   (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.
-
- */
 package org.apache.derby.impl.drda;
 
 /**
Index: java/drda/org/apache/derby/drda/NetworkServerControl.java
===================================================================
--- java/drda/org/apache/derby/drda/NetworkServerControl.java   (revision 43386)
+++ java/drda/org/apache/derby/drda/NetworkServerControl.java   (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.drda
-   (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.
 
- */
-
 package org.apache.derby.drda;
 
 import java.io.OutputStream;
Index: java/drda/org/apache/derby/drda/NetServlet.java
===================================================================
--- java/drda/org/apache/derby/drda/NetServlet.java     (revision 43386)
+++ java/drda/org/apache/derby/drda/NetServlet.java     (working copy)
@@ -1,13 +1,21 @@
 /*
+ * Copyright  2001-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
-   Licensed Materials - Property of IBM
-   Cloudscape - Package org.apache.derby.drda
-   (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.
 
- */
-
 package org.apache.derby.drda;
 
 import java.io.*;

Attachment: signature.asc
Description: OpenPGP digital signature



Reply via email to