diff --git a/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html b/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
index c802e59afe0..e5c91692a0c 100644
--- a/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
+++ b/contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package.html
@@ -1,3 +1,20 @@
+
+
diff --git a/contrib/analyzers/smartcn/src/java/overview.html b/contrib/analyzers/smartcn/src/java/overview.html
index 3909f6e32dd..9ea82ebba77 100644
--- a/contrib/analyzers/smartcn/src/java/overview.html
+++ b/contrib/analyzers/smartcn/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/ant/src/java/org/apache/lucene/ant/package.html b/contrib/ant/src/java/org/apache/lucene/ant/package.html
index 134c1c8977b..f076cfcaf4e 100644
--- a/contrib/ant/src/java/org/apache/lucene/ant/package.html
+++ b/contrib/ant/src/java/org/apache/lucene/ant/package.html
@@ -1,3 +1,20 @@
+
+
Ant task to create Lucene indexes.
diff --git a/contrib/ant/src/java/overview.html b/contrib/ant/src/java/overview.html
index 4498ccf0f2f..d81244ebe8f 100644
--- a/contrib/ant/src/java/overview.html
+++ b/contrib/ant/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
index 2ba02c1f748..efcd75ec90c 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java
@@ -1,5 +1,22 @@
package org.apache.lucene.benchmark.byTask.feeds;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.util.Properties;
import java.util.Random;
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
index 8fc7efe6afd..3feb9e35a41 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package.html
@@ -1,3 +1,20 @@
+
+
Sources for benchmark inputs: documents and queries.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
index 48eeb988ffb..0ecbe4b8da2 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
@@ -1,3 +1,20 @@
+
+
Sample performance test written programatically - no algorithm file is needed here.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
index 015c44a15bf..fb44623f5e5 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package.html
@@ -1,3 +1,20 @@
+
+
Statistics maintained when running benchmark tasks.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
index c3c81d6bbe1..9c17edc3c2c 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package.html
@@ -1,3 +1,20 @@
+
+
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
index cdb8dea4619..6a71c2fd39a 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package.html
@@ -1,3 +1,20 @@
+
+
Utilities used for the benchmark, and for the reports.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html
index e671b371b2d..1e958f7c1e3 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/package.html
@@ -1,3 +1,20 @@
+
+
Search Quality Benchmarking.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
index d29df9ec73b..f3d7b37d286 100644
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java
@@ -1,5 +1,22 @@
package org.apache.lucene.benchmark.quality.trec;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.lucene.benchmark.quality.trec.TrecJudge;
import org.apache.lucene.benchmark.quality.trec.TrecTopicsReader;
import org.apache.lucene.benchmark.quality.utils.SimpleQQParser;
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
index 61f3d876b2b..dafccb7fc8a 100755
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package.html
@@ -1,3 +1,20 @@
+
+
Utilities for Trec related quality benchmarking, feeding from Trec Topics and QRels inputs.
diff --git a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
index c213887e7d6..7fde1a86c63 100755
--- a/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
+++ b/contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package.html
@@ -1,3 +1,20 @@
+
+
Miscellaneous utilities for search quality benchmarking: query parsing, submission reports.
diff --git a/contrib/benchmark/src/java/overview.html b/contrib/benchmark/src/java/overview.html
index 8117d6d3512..c0f44cda211 100644
--- a/contrib/benchmark/src/java/overview.html
+++ b/contrib/benchmark/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/collation/src/java/overview.html b/contrib/collation/src/java/overview.html
index 0c949bc742b..cd090a9226d 100644
--- a/contrib/collation/src/java/overview.html
+++ b/contrib/collation/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/db/bdb-je/src/java/overview.html b/contrib/db/bdb-je/src/java/overview.html
index 5dd5a91d6b1..a74a2002e62 100644
--- a/contrib/db/bdb-je/src/java/overview.html
+++ b/contrib/db/bdb-je/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/db/bdb/src/java/overview.html b/contrib/db/bdb/src/java/overview.html
index 697dace0864..cdf0ea43327 100644
--- a/contrib/db/bdb/src/java/overview.html
+++ b/contrib/db/bdb/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html b/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
index 48b7117339f..ee023abfa70 100644
--- a/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
+++ b/contrib/fast-vector-highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
@@ -1,3 +1,20 @@
+
+
This is an another highlighter implementation.
diff --git a/contrib/fast-vector-highlighter/src/java/overview.html b/contrib/fast-vector-highlighter/src/java/overview.html
index 52fb22b4674..80fadd10ba0 100644
--- a/contrib/fast-vector-highlighter/src/java/overview.html
+++ b/contrib/fast-vector-highlighter/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
index 1281e47deb9..d65001241ae 100644
--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java
@@ -1,5 +1,22 @@
package org.apache.lucene.search.highlight;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/package.html b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/package.html
index 26a8554be8b..47dab1af012 100755
--- a/contrib/highlighter/src/java/org/apache/lucene/search/highlight/package.html
+++ b/contrib/highlighter/src/java/org/apache/lucene/search/highlight/package.html
@@ -1,3 +1,20 @@
+
+
diff --git a/contrib/highlighter/src/java/overview.html b/contrib/highlighter/src/java/overview.html
index 58afd1d8aee..98bf5acb82e 100644
--- a/contrib/highlighter/src/java/overview.html
+++ b/contrib/highlighter/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/instantiated/src/java/overview.html b/contrib/instantiated/src/java/overview.html
index d931b36a5a9..eb9b25e3102 100644
--- a/contrib/instantiated/src/java/overview.html
+++ b/contrib/instantiated/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/lucli/src/java/lucli/LuceneMethods.java b/contrib/lucli/src/java/lucli/LuceneMethods.java
index 056193c3af8..731ae7a4adb 100644
--- a/contrib/lucli/src/java/lucli/LuceneMethods.java
+++ b/contrib/lucli/src/java/lucli/LuceneMethods.java
@@ -1,57 +1,20 @@
package lucli;
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
- * reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Lucene" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Lucene", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import java.io.IOException;
diff --git a/contrib/lucli/src/java/lucli/Lucli.java b/contrib/lucli/src/java/lucli/Lucli.java
index a9693ba5ecf..8a117129bca 100644
--- a/contrib/lucli/src/java/lucli/Lucli.java
+++ b/contrib/lucli/src/java/lucli/Lucli.java
@@ -1,57 +1,20 @@
package lucli;
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
- * reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Lucene" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Lucene", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import java.io.File;
diff --git a/contrib/lucli/src/java/lucli/package.html b/contrib/lucli/src/java/lucli/package.html
index a7475f4c580..c96cd059e78 100644
--- a/contrib/lucli/src/java/lucli/package.html
+++ b/contrib/lucli/src/java/lucli/package.html
@@ -1,3 +1,20 @@
+
+
Lucene Command Line Interface
diff --git a/contrib/lucli/src/java/overview.html b/contrib/lucli/src/java/overview.html
index ca2fa2790dd..4e95640f6ea 100644
--- a/contrib/lucli/src/java/overview.html
+++ b/contrib/lucli/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/memory/src/java/org/apache/lucene/index/memory/package.html b/contrib/memory/src/java/org/apache/lucene/index/memory/package.html
index dc6d7900314..180836e2b62 100644
--- a/contrib/memory/src/java/org/apache/lucene/index/memory/package.html
+++ b/contrib/memory/src/java/org/apache/lucene/index/memory/package.html
@@ -1,3 +1,20 @@
+
+
High-performance single-document main memory Apache Lucene fulltext search index.
diff --git a/contrib/memory/src/java/overview.html b/contrib/memory/src/java/overview.html
index 281b15921cf..bbe3bda7815 100644
--- a/contrib/memory/src/java/overview.html
+++ b/contrib/memory/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java b/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java
index 2f0773c210b..e18e561c95b 100644
--- a/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java
+++ b/contrib/miscellaneous/src/java/org/apache/lucene/misc/ChainedFilter.java
@@ -1,57 +1,20 @@
package org.apache.lucene.misc;
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
- * reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Lucene" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
- * written permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * "Apache Lucene", nor may "Apache" appear in their name, without
- * prior written permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation. For more
- * information on the Apache Software Foundation, please see
- * .
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
import java.io.IOException;
diff --git a/contrib/miscellaneous/src/java/overview.html b/contrib/miscellaneous/src/java/overview.html
index 455f82dfee0..88e166f049a 100644
--- a/contrib/miscellaneous/src/java/overview.html
+++ b/contrib/miscellaneous/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/queries/src/java/org/apache/lucene/search/similar/package.html b/contrib/queries/src/java/org/apache/lucene/search/similar/package.html
index c75171e6873..8be87103e6d 100644
--- a/contrib/queries/src/java/org/apache/lucene/search/similar/package.html
+++ b/contrib/queries/src/java/org/apache/lucene/search/similar/package.html
@@ -1,3 +1,20 @@
+
+
Document similarity query generators.
diff --git a/contrib/queries/src/java/overview.html b/contrib/queries/src/java/overview.html
index 455f82dfee0..88e166f049a 100644
--- a/contrib/queries/src/java/overview.html
+++ b/contrib/queries/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/queries/src/test/org/apache/lucene/search/BoostingQueryTest.java b/contrib/queries/src/test/org/apache/lucene/search/BoostingQueryTest.java
index b6dfccc6cb4..f2779939ca7 100644
--- a/contrib/queries/src/test/org/apache/lucene/search/BoostingQueryTest.java
+++ b/contrib/queries/src/test/org/apache/lucene/search/BoostingQueryTest.java
@@ -1,5 +1,22 @@
package org.apache.lucene.search;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.lucene.index.Term;
import junit.framework.TestCase;
diff --git a/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java b/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
index be47e897460..c2c45b0db61 100644
--- a/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
+++ b/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java
@@ -1,5 +1,22 @@
package org.apache.lucene.search;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.util.HashSet;
import junit.framework.TestCase;
diff --git a/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfigListener.java b/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfigListener.java
index 0f9f6c1163d..a22bff88eee 100644
--- a/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfigListener.java
+++ b/contrib/queryparser/src/java/org/apache/lucene/queryParser/core/config/FieldConfigListener.java
@@ -1,5 +1,22 @@
package org.apache.lucene.queryParser.core.config;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
/**
* This interface should be implemented by classes that wants to listen for
* field configuration requests. The implementation receives a
diff --git a/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java b/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
index 9c3930f6227..ad982cd96aa 100644
--- a/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
+++ b/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
@@ -1,5 +1,22 @@
package org.apache.lucene.queryParser.standard;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.queryParser.core.QueryNodeException;
import org.apache.lucene.search.BooleanClause;
diff --git a/contrib/queryparser/src/java/overview.html b/contrib/queryparser/src/java/overview.html
index 8bc8141bdf5..9481dbabe5b 100644
--- a/contrib/queryparser/src/java/overview.html
+++ b/contrib/queryparser/src/java/overview.html
@@ -1,3 +1,19 @@
+
This package exists to allow access to useful package protected data within
diff --git a/contrib/regex/src/java/overview.html b/contrib/regex/src/java/overview.html
index 2c447de97a0..87f3adf66f0 100644
--- a/contrib/regex/src/java/overview.html
+++ b/contrib/regex/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/remote/src/java/overview.html b/contrib/remote/src/java/overview.html
index b581af33fef..e68ef1cef75 100644
--- a/contrib/remote/src/java/overview.html
+++ b/contrib/remote/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html b/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html
index d649f2156cf..907d9f45a19 100644
--- a/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html
+++ b/contrib/snowball/src/java/org/apache/lucene/analysis/snowball/package.html
@@ -1,3 +1,20 @@
+
+
{@link org.apache.lucene.analysis.TokenFilter} and {@link
diff --git a/contrib/snowball/src/java/org/tartarus/snowball/Among.java b/contrib/snowball/src/java/org/tartarus/snowball/Among.java
index 018ba30a093..d55c94c5767 100644
--- a/contrib/snowball/src/java/org/tartarus/snowball/Among.java
+++ b/contrib/snowball/src/java/org/tartarus/snowball/Among.java
@@ -1,6 +1,22 @@
-
package org.tartarus.snowball;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.lang.reflect.Method;
public class Among {
diff --git a/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java b/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java
index 58c56338197..4ef784cdd5b 100644
--- a/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java
+++ b/contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java
@@ -1,5 +1,22 @@
-
package org.tartarus.snowball;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.lang.reflect.InvocationTargetException;
/**
diff --git a/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java b/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java
index e1707f9eb4b..bb0dbe48b91 100644
--- a/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java
+++ b/contrib/snowball/src/java/org/tartarus/snowball/TestApp.java
@@ -1,6 +1,22 @@
-
package org.tartarus.snowball;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import java.lang.reflect.Method;
import java.io.Reader;
import java.io.Writer;
diff --git a/contrib/snowball/src/java/overview.html b/contrib/snowball/src/java/overview.html
index 7f393b0dbc1..bf63f6c6f31 100644
--- a/contrib/snowball/src/java/overview.html
+++ b/contrib/snowball/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/spatial/src/java/overview.html b/contrib/spatial/src/java/overview.html
index 757dea7de4a..1ed83f0cf51 100644
--- a/contrib/spatial/src/java/overview.html
+++ b/contrib/spatial/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/spellchecker/src/java/org/apache/lucene/search/spell/package.html b/contrib/spellchecker/src/java/org/apache/lucene/search/spell/package.html
index 3e9f67d7370..5c36cd7b3e2 100644
--- a/contrib/spellchecker/src/java/org/apache/lucene/search/spell/package.html
+++ b/contrib/spellchecker/src/java/org/apache/lucene/search/spell/package.html
@@ -1,3 +1,20 @@
+
+
Suggest alternate spellings for words.
diff --git a/contrib/spellchecker/src/java/overview.html b/contrib/spellchecker/src/java/overview.html
index 6f4f9339dcd..11a4c538135 100644
--- a/contrib/spellchecker/src/java/overview.html
+++ b/contrib/spellchecker/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html b/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html
index f4105e3483f..f8457d1eda4 100644
--- a/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html
+++ b/contrib/surround/src/java/org/apache/lucene/queryParser/surround/parser/package.html
@@ -1,3 +1,20 @@
+
+
Surround parser package
diff --git a/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html b/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html
index a967f4e2615..4d125a23af5 100644
--- a/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html
+++ b/contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/package.html
@@ -1,3 +1,20 @@
+
+
Surround query package
diff --git a/contrib/surround/src/java/overview.html b/contrib/surround/src/java/overview.html
index 4fad86c86c1..e4fbefcd079 100644
--- a/contrib/surround/src/java/overview.html
+++ b/contrib/surround/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/swing/src/java/org/apache/lucene/swing/models/package.html b/contrib/swing/src/java/org/apache/lucene/swing/models/package.html
index eec1be2eb46..5958657fde9 100644
--- a/contrib/swing/src/java/org/apache/lucene/swing/models/package.html
+++ b/contrib/swing/src/java/org/apache/lucene/swing/models/package.html
@@ -1,3 +1,20 @@
+
+
Decorators for JTable TableModel and JList ListModel encapsulating Lucene indexing and searching functionality.
diff --git a/contrib/swing/src/java/overview.html b/contrib/swing/src/java/overview.html
index d2438c0ea1f..2331985df89 100644
--- a/contrib/swing/src/java/overview.html
+++ b/contrib/swing/src/java/overview.html
@@ -1,3 +1,19 @@
+
Apache Lucene Swing Component Models
diff --git a/contrib/wikipedia/src/java/overview.html b/contrib/wikipedia/src/java/overview.html
index b509a01bd67..118283ff91b 100644
--- a/contrib/wikipedia/src/java/overview.html
+++ b/contrib/wikipedia/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/wordnet/src/java/org/apache/lucene/wordnet/package.html b/contrib/wordnet/src/java/org/apache/lucene/wordnet/package.html
index 8625a7d2fd8..490713588a7 100755
--- a/contrib/wordnet/src/java/org/apache/lucene/wordnet/package.html
+++ b/contrib/wordnet/src/java/org/apache/lucene/wordnet/package.html
@@ -1,3 +1,20 @@
+
+
WordNet Lucene Synonyms Integration
diff --git a/contrib/wordnet/src/java/overview.html b/contrib/wordnet/src/java/overview.html
index b490f72c8d5..cd05399880b 100644
--- a/contrib/wordnet/src/java/overview.html
+++ b/contrib/wordnet/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/query.xsl b/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/query.xsl
index ac321f4d4cc..3be114c2a1c 100644
--- a/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/query.xsl
+++ b/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/query.xsl
@@ -1,4 +1,20 @@
+
diff --git a/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/web.xml b/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/web.xml
index 685ec9989ee..b0388e0f83e 100644
--- a/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/web.xml
+++ b/contrib/xml-query-parser/src/demo/WebContent/WEB-INF/web.xml
@@ -1,4 +1,20 @@
+
LuceneXmlQueryWebDemo
diff --git a/contrib/xml-query-parser/src/java/overview.html b/contrib/xml-query-parser/src/java/overview.html
index 354b4bd0ee4..c1e6a898096 100644
--- a/contrib/xml-query-parser/src/java/overview.html
+++ b/contrib/xml-query-parser/src/java/overview.html
@@ -1,3 +1,19 @@
+
diff --git a/src/java/overview.html b/src/java/overview.html
index 0f25cd1b23a..33191bd9747 100644
--- a/src/java/overview.html
+++ b/src/java/overview.html
@@ -1,3 +1,19 @@
+