diff --git a/gradle/template.gradle.properties b/gradle/template.gradle.properties index b6ae69b85e82..946c47b2fce1 100644 --- a/gradle/template.gradle.properties +++ b/gradle/template.gradle.properties @@ -1,3 +1,5 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + ############################# # Local developer settings # ############################# diff --git a/gradle/testing/defaults-tests/logging.properties b/gradle/testing/defaults-tests/logging.properties index f54ee74f6e0b..fcada2943325 100644 --- a/gradle/testing/defaults-tests/logging.properties +++ b/gradle/testing/defaults-tests/logging.properties @@ -1,3 +1,4 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. # root handler handlers=java.util.logging.ConsoleHandler diff --git a/gradle/validation/rat-sources.gradle b/gradle/validation/rat-sources.gradle index b47f4399ddd6..dce061407ca4 100644 --- a/gradle/validation/rat-sources.gradle +++ b/gradle/validation/rat-sources.gradle @@ -152,12 +152,10 @@ allprojects { exclude "**/*gradle.lockfile" - // TODO: SOLR-15601 ? - exclude "**/*.properties" exclude "**/*.txt" - // TODO: SOLR-15601: HTML should carry the license, perhaps? - exclude "**/*.html" + // Solr core marker file; often empty + exclude "**/core.properties" // Conditionally apply module-specific patterns. switch (project.path) { @@ -203,16 +201,6 @@ allprojects { exclude "src/test-files/META-INF/services/*" break - case ":solr:modules:ltr": - // TODO: SOLR-15601: Some of these should carry the license, perhaps? - exclude "**/*.py" - break - - case ":solr:modules:scripting": - // TODO: SOLR-15601: Some of these should carry the license, perhaps? - exclude "**/*.js" - break - case ":solr:modules:s3-repository": exclude "src/test-files/s3.conf" // empty file break @@ -222,7 +210,6 @@ allprojects { break case ":solr:core": - exclude "src/resources/*.xml" exclude "src/test-files/**/*.aff" exclude "src/test-files/**/*.dic" exclude "src/test-files/**/*.conf" @@ -232,18 +219,10 @@ allprojects { break case ":solr:server": - exclude "**/*.xml" - exclude "**/*.sh" - exclude "**/*.bat" - exclude "**/*.cmd" - exclude "**/*.js" + // Vendored (or adapted) from the Jetty distribution; not Solr's own IP. + exclude "etc/jetty*.xml" + exclude "etc/webdefault.xml" exclude "modules" - // zoo.cfg intentionally has no header and serves as the RAT detection canary. - ratCanaryPath.set("/solr/zoo.cfg") - break - - case ":solr:webapp": - exclude "web/img/**" break case ":solr:solr-ref-guide": @@ -251,18 +230,19 @@ allprojects { break case ":solr:docker": - exclude "tests/**/*.xml" + // Deliberately malformed XML used to test the docker image's handling of a broken log4j2 config. + exclude "tests/cases/test_log4j/bogus-log4j2.xml" break case ":solr:example": - exclude "**/*.xml" - exclude "**/*.cfg" - exclude "**/*.js" - exclude "films/README.md" + // films.xml is third-party (Freebase) data, like films/README.md. + exclude "films/films.xml" + // films/README.md documents third-party (Freebase) data and intentionally has no + // header, so it serves as the RAT detection canary. + ratCanaryPath.set("/films/README.md") break case ":solr:solrj": - exclude "src/test-files/**/*.cfg" exclude "src/test-files/**/*.xml" break } diff --git a/solr/core/src/test-files/exampledocs/example.html b/solr/core/src/test-files/exampledocs/example.html index 5732f6214bcd..9c2974eb44cb 100644 --- a/solr/core/src/test-files/exampledocs/example.html +++ b/solr/core/src/test-files/exampledocs/example.html @@ -1,3 +1,19 @@ + Welcome to Solr diff --git a/solr/core/src/test-files/solr/collection1/conf/example.html b/solr/core/src/test-files/solr/collection1/conf/example.html index bb8f277568b4..0c5f19625251 100644 --- a/solr/core/src/test-files/solr/collection1/conf/example.html +++ b/solr/core/src/test-files/solr/collection1/conf/example.html @@ -1,3 +1,19 @@ + Welcome to Solr diff --git a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html index 6bd19d4db6cf..3f41212fd387 100644 --- a/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html +++ b/solr/core/src/test/org/apache/solr/analysis/htmlStripReaderTest.html @@ -1,4 +1,20 @@ + @@ -49,7 +65,7 @@ +-->
-  + 
@@ -211,8 +227,8 @@

Welcome to Solr

- - + +

What Is Solr?

@@ -227,7 +243,7 @@

What Is Solr?

- +

News

@@ -239,36 +255,36 @@

02 October 2007 - Solr at OSSummit Asia

The following talks and trainings are scheduled for the upcoming 2008 OSSummit:

03 September 2007 - Lucene at ApacheCon Atlanta

ApacheCon US logo - Lucene will once again be well represented at ApacheCon USA in Atlanta this November 12-16, 2007. + Lucene will once again be well represented at ApacheCon USA in Atlanta this November 12-16, 2007.

The following talks and trainings are scheduled for this year's conference:

06 June 2007: Release 1.2 available

@@ -295,14 +311,14 @@

22 December 2006: Release 1.1.0 available

15 August 2006: Solr at ApacheCon US

Chris Hostetter will be presenting - "Faceted Searching With Apache Solr" + "Faceted Searching With Apache Solr" at ApacheCon US 2006, on October 13th at 4:30pm. See the ApacheCon website for more details.

21 April 2006: Solr at ApacheCon

Yonik Seeley will be presenting - "Apache Solr, a Full-Text Search Server based on Lucene" + "Apache Solr, a Full-Text Search Server based on Lucene" at ApacheCon Europe 2006, on June 29th at 5:30pm. See the ApacheCon website for more details.

@@ -321,7 +337,7 @@

17 January 2006: Solr Joins Apache Incubator

- + Welcome to Solr diff --git a/solr/modules/extraction/src/test-files/extraction/example.html b/solr/modules/extraction/src/test-files/extraction/example.html index 2801c3c97d83..aa912a61090c 100644 --- a/solr/modules/extraction/src/test-files/extraction/example.html +++ b/solr/modules/extraction/src/test-files/extraction/example.html @@ -1,3 +1,19 @@ + Welcome to Solr diff --git a/solr/modules/extraction/src/test-files/extraction/simple.html b/solr/modules/extraction/src/test-files/extraction/simple.html index 3ec4d4e0d01b..fb33df543acd 100644 --- a/solr/modules/extraction/src/test-files/extraction/simple.html +++ b/solr/modules/extraction/src/test-files/extraction/simple.html @@ -1,3 +1,19 @@ + Welcome to Solr diff --git a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties index 8a4eff174fdf..4cac9e7cea05 100644 --- a/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties +++ b/solr/modules/extraction/src/test-files/extraction/solr/collection1/conf/passwordRegex.properties @@ -1,7 +1,9 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. +# # Filename regex -> password map # Example any file ending in .doc should use password foobar: # .*\.doc = fooBar # -# Note: Apache Tika 1.1 supports password for .pdf and .docx only, not .doc or other formats +# Note: Apache Tika 1.1 supports password for .pdf and .docx only, not .doc or other formats .*\.pdf$ = solrRules -.*\.docx$ = Word2010 \ No newline at end of file +.*\.docx$ = Word2010 diff --git a/solr/modules/ltr/example/libsvm_formatter.py b/solr/modules/ltr/example/libsvm_formatter.py index 4bcb76122b8e..91d89d21b1e5 100644 --- a/solr/modules/ltr/example/libsvm_formatter.py +++ b/solr/modules/ltr/example/libsvm_formatter.py @@ -1,3 +1,18 @@ +# 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. + from subprocess import call import os @@ -6,7 +21,7 @@ class LibSvmFormatter: def processQueryDocFeatureVector(self,docClickInfo,trainingFile): - '''Expects as input a sorted by queries list or generator that provides the context + '''Expects as input a sorted by queries list or generator that provides the context for each query in a tuple composed of: (query , docId , relevance , source , featureVector). The list of documents that are part of the same query will generate comparisons against each other for training. ''' @@ -82,7 +97,7 @@ def _writeRankSVMPairs(listOfFeatures,output): (4, {1:0.9, 2:0.9, 3:0.1}) (3, {1:0.7, 2:0.9, 3:0.2}) (1, {1:0.1, 2:0.9, 6:0.1}) - ] + ] ''' for d1 in range(0,len(listOfFeatures)): for d2 in range(d1+1,len(listOfFeatures)): diff --git a/solr/modules/ltr/example/train_and_upload_demo_model.py b/solr/modules/ltr/example/train_and_upload_demo_model.py index 31d7532dd94c..24b6ada40069 100755 --- a/solr/modules/ltr/example/train_and_upload_demo_model.py +++ b/solr/modules/ltr/example/train_and_upload_demo_model.py @@ -1,5 +1,20 @@ #!/usr/bin/env python3 +# 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 sys import json import http.client diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js index 1b3c9fc2d6e4..7a4807750d72 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/addfields.updateprocessor.js @@ -1,18 +1,33 @@ +// 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. + function processAdd(cmd) { - // Integer.valueOf is needed here to get a tru java object, because + // Integer.valueOf is needed here to get a tru java object, because // all javascript numbers are floating point (ie: java.lang.Double) - cmd.getSolrInputDocument().addField("script_added_i", + cmd.getSolrInputDocument().addField("script_added_i", java.lang.Integer.valueOf(42)); cmd.getSolrInputDocument().addField("script_added_d", 42.3); - + } -// // // +// // // function processDelete() { // NOOP } -function processCommit() { +function processCommit() { // NOOP } function processRollback() { @@ -21,6 +36,6 @@ function processRollback() { function processMergeIndexes() { // NOOP } -function finish() { +function finish() { // NOOP } diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js index 5ec9487c1502..4bbdd65552ad 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/conditional.updateprocessor.js @@ -1,3 +1,18 @@ +// 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. + function processAdd(cmd) { if (req.getParams().getBool("go-for-it",false)) { cmd.getSolrInputDocument().addField("script_added_s", "i went for it"); @@ -6,12 +21,12 @@ function processAdd(cmd) { return false; } -// // // +// // // function processDelete() { // NOOP } -function processCommit() { +function processCommit() { // NOOP } function processRollback() { @@ -20,6 +35,6 @@ function processRollback() { function processMergeIndexes() { // NOOP } -function finish() { +function finish() { // NOOP } diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js index 2fcd6c3baf69..70710539bdc8 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/cross-compatible.js @@ -1,3 +1,18 @@ +// 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. + function get_class(name) { var clazz; try { diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js index d49481481196..6b405c2668d3 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/evil.js @@ -1,3 +1,18 @@ +// 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. + var sys = Packages.java.lang.System; function processAdd(cmd) { diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js index 6e8728a0d771..578a9fc24fb1 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/missing.functions.updateprocessor.js @@ -1,3 +1,18 @@ +// 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. + function doSomeStuff() { return "This script doesn't contain any update processor functions"; } diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js index ca56fe35cfe2..b1948a18eb31 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/throw.error.on.add.updateprocessor.js @@ -1,13 +1,28 @@ +// 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. + function processAdd() { throw "guess what? no-soup-fo-you !!!"; } -// // // +// // // function processDelete() { // NOOP } -function processCommit() { +function processCommit() { // NOOP } function processRollback() { @@ -16,6 +31,6 @@ function processRollback() { function processMergeIndexes() { // NOOP } -function finish() { +function finish() { // NOOP } diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js index b1856b15d855..1d9dac2fcb2c 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor0.js @@ -1,3 +1,18 @@ +// 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. + var Assert = Packages.org.junit.Assert; function processAdd(cmd) { @@ -10,12 +25,12 @@ function processAdd(cmd) { Assert.assertTrue(1 == params.get('intValue').intValue()); // had issues with assertTrue(1, params.get('intValue').intValue()) casting to wrong variant Assert.assertTrue(params.get('boolValue').booleanValue()); - // Integer.valueOf is needed here to get a tru java object, because + // Integer.valueOf is needed here to get a tru java object, because // all javascript numbers are floating point (ie: java.lang.Double) - cmd.getSolrInputDocument().addField("script_added_i", + cmd.getSolrInputDocument().addField("script_added_i", java.lang.Integer.valueOf(42)); cmd.getSolrInputDocument().addField("script_added_d", 42.3); - + } function processDelete(cmd) { diff --git a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js index 98bdf2ab0604..f7d33286495d 100644 --- a/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js +++ b/solr/modules/scripting/src/test-files/scripting/solr/collection1/conf/trivial.updateprocessor1.js @@ -1,6 +1,21 @@ +// 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. + function processAdd(cmd) { functionMessages.add("processAdd1"); - + } function processDelete(cmd) { diff --git a/solr/modules/sql/src/resources/saffron.properties b/solr/modules/sql/src/resources/saffron.properties index 4a60b5d34e21..791974058178 100644 --- a/solr/modules/sql/src/resources/saffron.properties +++ b/solr/modules/sql/src/resources/saffron.properties @@ -1,2 +1,4 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. +# # See SOLR-16433 and CALCITE-5298 calcite.test.dataset=. diff --git a/solr/server/resources/jetty-logging.properties b/solr/server/resources/jetty-logging.properties index 55b0c37d3480..49d4d5256a42 100644 --- a/solr/server/resources/jetty-logging.properties +++ b/solr/server/resources/jetty-logging.properties @@ -1 +1,3 @@ -org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog \ No newline at end of file +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + +org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js index b3f9ee56c137..e4a05808ab19 100644 --- a/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js +++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/update-script.js @@ -1,3 +1,18 @@ +// 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 is a basic skeleton JavaScript update processor. diff --git a/solr/server/solr/zoo.cfg b/solr/server/solr/zoo.cfg index 828bb893100d..393a2b13956d 100644 --- a/solr/server/solr/zoo.cfg +++ b/solr/server/solr/zoo.cfg @@ -1,3 +1,5 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + # The number of milliseconds of each tick tickTime=2000 # The number of ticks that the initial diff --git a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties index 662ea883e5ac..67d443be5643 100644 --- a/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties +++ b/solr/solrj/src/resources/DeprecatedSystemPropertyMappings.properties @@ -1,3 +1,5 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. +# # Mapping current system property name to legacy system property names # This file only contains non-standard mappings that do not follow the standard naming conversion convention # You do not need a entry for a solrMyProperty to solr.my.property conversion @@ -54,7 +56,7 @@ solr.security.allow.urls.enabled=!solr.disable.allow.urls solr.security.allow.urls=solr.allow.urls solr.security.auth.basicauth.credentials=basicauth solr.security.auth.plugin=authentication.plugin - + solr.solrj.cloud.max.stale.retries=cloud.solr.client.max.stale.retries solr.streamingexpressions.facet.tiered.enabled=solr.facet.stream.tiered diff --git a/solr/solrj/src/resources/EnvToSyspropMappings.properties b/solr/solrj/src/resources/EnvToSyspropMappings.properties index ed6e742cebcc..176bccf7a136 100644 --- a/solr/solrj/src/resources/EnvToSyspropMappings.properties +++ b/solr/solrj/src/resources/EnvToSyspropMappings.properties @@ -1,3 +1,5 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. +# # Mapping from Environment variable to system property # This file only contains non-standard mappings that do not follow the standard naming convention # Map to nothing to avoid setting any system property for the env.variable diff --git a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg index 5c4dc5c6b5a8..7ce8474fbef0 100644 --- a/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg +++ b/solr/solrj/src/test-files/solrj/solr/multicore/zoo.cfg @@ -1,3 +1,5 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements; and to You under the Apache License, Version 2.0. + # The number of milliseconds of each tick tickTime=2000 # The number of ticks that the initial diff --git a/solr/webapp/web/error404.html b/solr/webapp/web/error404.html index 779117107dcc..3d15bd697608 100644 --- a/solr/webapp/web/error404.html +++ b/solr/webapp/web/error404.html @@ -1,3 +1,19 @@ +

Searching for Solr?
You must type the correct path.