diff --git a/bootstrap.sh b/bootstrap.sh
index aae8d6657..29d06dee3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,18 @@
#!/bin/sh
-# Copyright (c) 2000-2003 The Apache Software Foundation. All rights
-# reserved.
+# Copyright 2000-2004 Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
diff --git a/build.xml b/build.xml
index d28f2dfa6..bf9c06aef 100644
--- a/build.xml
+++ b/build.xml
@@ -687,6 +687,7 @@
+
@@ -739,7 +740,10 @@
-
+
+
+
+
@@ -769,7 +773,10 @@
basedir="${build.classes}"
manifest="${manifest}">
-
+
+
+
+
@@ -814,7 +821,10 @@
-
+
+
+
+
@@ -974,6 +984,7 @@
+
@@ -1065,6 +1076,7 @@
+