diff --git a/src/java/org/apache/solr/common/luke/FieldFlag.java b/src/java/org/apache/solr/common/luke/FieldFlag.java index 5d6668d7dbb..63d835682a4 100644 --- a/src/java/org/apache/solr/common/luke/FieldFlag.java +++ b/src/java/org/apache/solr/common/luke/FieldFlag.java @@ -1,4 +1,21 @@ package org.apache.solr.common.luke; +/** + * 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. + */ + /** * @version $Id: AdminHandlers.java 608150 2008-01-02 17:15:30Z ryan $ diff --git a/src/java/org/apache/solr/handler/component/ShardResponse.java b/src/java/org/apache/solr/handler/component/ShardResponse.java index 15321d05563..6360408f4bc 100755 --- a/src/java/org/apache/solr/handler/component/ShardResponse.java +++ b/src/java/org/apache/solr/handler/component/ShardResponse.java @@ -1,4 +1,20 @@ package org.apache.solr.handler.component; +/** + * 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.solr.client.solrj.SolrResponse; import org.apache.solr.common.SolrException; diff --git a/src/java/org/apache/solr/highlight/SolrHighlighter.java b/src/java/org/apache/solr/highlight/SolrHighlighter.java index 6c511d150fa..9da9247de9d 100644 --- a/src/java/org/apache/solr/highlight/SolrHighlighter.java +++ b/src/java/org/apache/solr/highlight/SolrHighlighter.java @@ -1,4 +1,20 @@ package org.apache.solr.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.Collections; @@ -7,11 +23,6 @@ import java.util.Map; import java.util.logging.Logger; import org.apache.lucene.search.Query; -import org.apache.lucene.search.highlight.Formatter; -import org.apache.lucene.search.highlight.Fragmenter; -import org.apache.lucene.search.highlight.Highlighter; -import org.apache.lucene.search.highlight.QueryScorer; -import org.apache.solr.common.SolrException; import org.apache.solr.common.params.HighlightParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; @@ -20,16 +31,16 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.DocList; import org.apache.solr.util.SolrPluginUtils; -public abstract class SolrHighlighter +public abstract class SolrHighlighter { public static Logger log = Logger.getLogger(SolrHighlighter.class.getName()); // Thread safe registry - protected final Map formatters = + protected final Map formatters = Collections.synchronizedMap( new HashMap() ); // Thread safe registry - protected final Map fragmenters = + protected final Map fragmenters = Collections.synchronizedMap( new HashMap() ); public abstract void initalize( final Config config ); @@ -61,7 +72,7 @@ public abstract class SolrHighlighter if (emptyArray(defaultFields)) { String defaultSearchField = request.getSchema().getSolrQueryParser(null).getField(); fields = null == defaultSearchField ? new String[]{} : new String[]{defaultSearchField}; - } + } else { fields = defaultFields; } @@ -87,7 +98,7 @@ public abstract class SolrHighlighter * @param req the current request * @param defaultFields default list of fields to summarize * - * @return NamedList containing a NamedList for each document, which in + * @return NamedList containing a NamedList for each document, which in * turns contains sets (field, summary) pairs. */ @SuppressWarnings("unchecked") diff --git a/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java b/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java index 7e3ce790727..ab8ffa4e715 100755 --- a/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java +++ b/src/java/org/apache/solr/request/BinaryQueryResponseWriter.java @@ -1,4 +1,21 @@ package org.apache.solr.request; +/** + * 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.Writer; import java.io.OutputStream; diff --git a/src/java/org/apache/solr/schema/ShortField.java b/src/java/org/apache/solr/schema/ShortField.java index 6240ec64c80..af9c8a2cd4d 100644 --- a/src/java/org/apache/solr/schema/ShortField.java +++ b/src/java/org/apache/solr/schema/ShortField.java @@ -1,4 +1,20 @@ package org.apache.solr.schema; +/** + * 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.document.Fieldable; import org.apache.lucene.search.SortField; diff --git a/src/java/org/apache/solr/schema/SimilarityFactory.java b/src/java/org/apache/solr/schema/SimilarityFactory.java index 7cefcc4a86c..25b03a0ad68 100644 --- a/src/java/org/apache/solr/schema/SimilarityFactory.java +++ b/src/java/org/apache/solr/schema/SimilarityFactory.java @@ -1,4 +1,20 @@ package org.apache.solr.schema; +/** + * 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.search.Similarity; import org.apache.solr.common.params.SolrParams; diff --git a/src/java/org/apache/solr/search/function/ShortFieldSource.java b/src/java/org/apache/solr/search/function/ShortFieldSource.java index 517c135971b..5dd24fb383d 100644 --- a/src/java/org/apache/solr/search/function/ShortFieldSource.java +++ b/src/java/org/apache/solr/search/function/ShortFieldSource.java @@ -1,4 +1,20 @@ package org.apache.solr.search.function; +/** + * 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.search.FieldCache; import org.apache.lucene.index.IndexReader; diff --git a/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java b/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java index d51367d92e2..7717b23a25a 100644 --- a/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java +++ b/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java @@ -1,5 +1,23 @@ package org.apache.solr.spelling; +import org.apache.lucene.search.spell.StringDistance; +/** + * 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.File; import java.io.IOException; import java.util.Arrays; diff --git a/src/java/org/apache/solr/spelling/QueryConverter.java b/src/java/org/apache/solr/spelling/QueryConverter.java index 8f6b7aaa342..4e276afa2e9 100644 --- a/src/java/org/apache/solr/spelling/QueryConverter.java +++ b/src/java/org/apache/solr/spelling/QueryConverter.java @@ -1,4 +1,20 @@ package org.apache.solr.spelling; +/** + * 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.analysis.Token; diff --git a/src/java/org/apache/solr/spelling/SpellingResult.java b/src/java/org/apache/solr/spelling/SpellingResult.java index 18d6c0b6fad..aeeacbd2287 100644 --- a/src/java/org/apache/solr/spelling/SpellingResult.java +++ b/src/java/org/apache/solr/spelling/SpellingResult.java @@ -1,4 +1,20 @@ package org.apache.solr.spelling; +/** + * 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.Token; diff --git a/src/java/org/apache/solr/util/ArraysUtils.java b/src/java/org/apache/solr/util/ArraysUtils.java index 9be432bbcda..55b3a777fa3 100644 --- a/src/java/org/apache/solr/util/ArraysUtils.java +++ b/src/java/org/apache/solr/util/ArraysUtils.java @@ -1,4 +1,20 @@ package org.apache.solr.util; +/** + * 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. + */ /**