diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 43bb566a6cb992177aa76b87cbef2146b99d4646..2bc97f207861d748ecc79403a1a63907408408d0 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -16,10 +16,10 @@
<dependencies>
<!-- Solr -->
<dependency conf="solr-war->default" org="org.apache.solr" name="solr" rev="4.9.1" transitive="false" /> <!-- the war file for embedded Solr 4 -->
- <dependency name="solr-cell" rev="8.6.2" org="org.apache.solr" conf="solr-libs->default"/>
+ <dependency name="solr-cell" rev="8.6.3" org="org.apache.solr" conf="solr-libs->default"/>
<!-- Autopsy -->
- <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.6.2"/>
+ <dependency conf="autopsy->*" org="org.apache.solr" name="solr-solrj" rev="8.6.3"/>
<dependency conf="autopsy->*" org="commons-lang" name="commons-lang" rev="2.4"/>
<dependency conf="autopsy->*" org="commons-validator" name="commons-validator" rev="1.5.1"/>
<dependency conf="autopsy->*" org="com.optimaize.languagedetector" name="language-detector" rev="0.6"/>
diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties
index f344cc4dd4e7992287480b24e68a147a84f10d91..fb664812ecd06b29f2bb76b4338312df74010081 100644
--- a/KeywordSearch/nbproject/project.properties
+++ b/KeywordSearch/nbproject/project.properties
@@ -5,26 +5,26 @@ file.reference.cdm-4.5.5.jar=release/modules/ext/cdm-4.5.5.jar
file.reference.cleartk-util-2.0.0.jar=release/modules/ext/cleartk-util-2.0.0.jar
file.reference.commons-beanutils-1.9.2.jar=release/modules/ext/commons-beanutils-1.9.2.jar
file.reference.commons-collections-3.2.2.jar=release/modules/ext/commons-collections-3.2.2.jar
-file.reference.commons-digester-1.8.1.jar=release/modules/ext/commons-digester-1.8.1.jar
+file.reference.commons-digester-1.8.1.jar=release\\modules\\ext\\commons-digester-1.8.1.jar
file.reference.commons-exec-1.3.jar=release/modules/ext/commons-exec-1.3.jar
-file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar
-file.reference.commons-logging-api-1.1.jar=release/modules/ext/commons-logging-api-1.1.jar
+file.reference.commons-io-2.6.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-io-2.6.jar
+file.reference.commons-lang-2.6.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-lang-2.6.jar
+file.reference.commons-logging-1.2.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\commons-logging-1.2.jar
file.reference.commons-validator-1.5.1.jar=release/modules/ext/commons-validator-1.5.1.jar
file.reference.ehcache-core-2.6.2.jar=release/modules/ext/ehcache-core-2.6.2.jar
file.reference.findstructapi-0.0.1.jar=release/modules/ext/findstructapi-0.0.1.jar
file.reference.grib-4.5.5.jar=release/modules/ext/grib-4.5.5.jar
file.reference.guava-18.0.jar=release/modules/ext/guava-18.0.jar
-file.reference.httpclient-4.5.10.jar=release/modules/ext/httpclient-4.5.10.jar
-file.reference.httpcore-4.4.12.jar=release/modules/ext/httpcore-4.4.12.jar
-file.reference.httpmime-4.5.10.jar=release/modules/ext/httpmime-4.5.10.jar
+file.reference.httpclient-4.5.10.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpclient-4.5.10.jar
+file.reference.httpcore-4.4.12.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpcore-4.4.12.jar
+file.reference.httpmime-4.5.10.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\httpmime-4.5.10.jar
file.reference.httpservices-4.5.5.jar=release/modules/ext/httpservices-4.5.5.jar
file.reference.icu4j-3.8.jar=release/modules/ext/icu4j-3.8.jar
file.reference.java-libpst-0.8.1.jar=release/modules/ext/java-libpst-0.8.1.jar
file.reference.jcip-annotations-1.0.jar=release/modules/ext/jcip-annotations-1.0.jar
file.reference.jcommander-1.35.jar=release/modules/ext/jcommander-1.35.jar
file.reference.jdom-1.0.jar=release/modules/ext/jdom-1.0.jar
-file.reference.jericho-html-3.3.jar=release/modules/ext/jericho-html-3.3.jar
+file.reference.jericho-html-3.3.jar=release\\modules\\ext\\jericho-html-3.3.jar
file.reference.joda-time-2.2.jar=release/modules/ext/joda-time-2.2.jar
file.reference.json-simple-1.1.1.jar=release/modules/ext/json-simple-1.1.1.jar
file.reference.juniversalchardet-1.0.3.jar=release/modules/ext/juniversalchardet-1.0.3.jar
@@ -43,7 +43,9 @@ file.reference.poi-ooxml-schemas-4.0.1.jar=release/modules/ext/poi-ooxml-schemas
file.reference.poi-scratchpad-4.0.1.jar=release/modules/ext/poi-scratchpad-4.0.1.jar
file.reference.protobuf-java-2.5.0.jar=release/modules/ext/protobuf-java-2.5.0.jar
file.reference.quartz-2.2.0.jar=release/modules/ext/quartz-2.2.0.jar
+file.reference.slf4j-api-1.7.25.jar=C:\\cygwin64\\home\\elivis\\autopsy\\KeywordSearch\\release\\modules\\ext\\slf4j-api-1.7.25.jar
file.reference.solr-solrj-8.6.2.jar=release/modules/ext/solr-solrj-8.6.2.jar
+file.reference.solr-solrj-8.6.3.jar=release/modules/ext/solr-solrj-8.6.3.jar
file.reference.sqlwrapper-0.0.1.jar=release/modules/ext/sqlwrapper-0.0.1.jar
file.reference.stax2-api-3.1.4.jar=release/modules/ext/stax2-api-3.1.4.jar
file.reference.tagsoup-1.2.1.jar=release/modules/ext/tagsoup-1.2.1.jar
@@ -58,8 +60,6 @@ file.reference.xmpcore-5.1.3.jar=release/modules/ext/xmpcore-5.1.3.jar
file.reference.zookeeper-3.5.7.jar=release/modules/ext/zookeeper-3.5.7.jar
file.reference.annotations-12.0.jar=release\\modules\\ext\\annotations-12.0.jar
file.reference.jsonic-1.2.11.jar=release\\modules\\ext\\jsonic-1.2.11.jar
-file.reference.slf4j-api-1.7.6.jar=release\\modules\\ext\\slf4j-api-1.7.6.jar
-file.reference.wstx-asl-3.2.7.jar=release\\modules\\ext\\wstx-asl-3.2.7.jar
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index ded38fe65dacd2a0966dc566be6331f60ca3b215..f1ed1599fa6e4aa50dbaf8e250112495334e8ac3 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -142,7 +142,6 @@
</module-dependencies>
<public-packages>
<package>org.apache.commons.logging.impl</package>
- <package>org.apache.tika.parser.txt</package>
<package>org.apache.http</package>
<package>org.apache.http.annotation</package>
<package>org.apache.http.auth</package>
@@ -186,9 +185,6 @@
<package>org.apache.http.protocol</package>
<package>org.apache.http.ssl</package>
<package>org.apache.http.util</package>
- <package>org.apache.jute</package>
- <package>org.apache.jute.compiler</package>
- <package>org.apache.jute.compiler.generated</package>
<package>org.apache.solr.client.solrj</package>
<package>org.apache.solr.client.solrj.beans</package>
<package>org.apache.solr.client.solrj.impl</package>
@@ -203,17 +199,13 @@
<package>org.apache.zookeeper</package>
<package>org.apache.zookeeper.client</package>
<package>org.apache.zookeeper.common</package>
- <package>org.apache.zookeeper.data</package>
<package>org.apache.zookeeper.jmx</package>
- <package>org.apache.zookeeper.proto</package>
<package>org.apache.zookeeper.server</package>
<package>org.apache.zookeeper.server.auth</package>
<package>org.apache.zookeeper.server.persistence</package>
<package>org.apache.zookeeper.server.quorum</package>
<package>org.apache.zookeeper.server.quorum.flexible</package>
- <package>org.apache.zookeeper.server.upgrade</package>
<package>org.apache.zookeeper.server.util</package>
- <package>org.apache.zookeeper.txn</package>
<package>org.apache.zookeeper.version</package>
<package>org.apache.zookeeper.version.util</package>
<package>org.codehaus.stax2</package>
@@ -224,140 +216,44 @@
<package>org.sleuthkit.autopsy.keywordsearch</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\guava-18.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/httpmime-4.5.10.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/httpmime-4.5.10.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jericho-html-3.3.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/cdm-4.5.5.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/cdm-4.5.5.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/httpservices-4.5.5.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/boilerpipe-1.1.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-logging-api-1.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/commons-logging-api-1.1.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/quartz-2.2.0.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/quartz-2.2.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/icu4j-3.8.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/icu4j-3.8.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\language-detector-0.6.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/guava-18.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin>
+ <runtime-relative-path>ext/findstructapi-0.0.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/findstructapi-0.0.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-digester-1.8.1.jar</runtime-relative-path>
<binary-origin>release\modules\ext\commons-digester-1.8.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/httpmime-4.5.6.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpmime-4.5.6.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/httpclient-4.5.6.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpclient-4.5.6.jar</binary-origin>
+ <runtime-relative-path>ext/jcommander-1.35.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/jcommander-1.35.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\commons-validator-1.5.1.jar</binary-origin>
+ <runtime-relative-path>ext/vorbis-java-core-0.8.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/vorbis-java-core-0.8.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/commons-lang-2.4.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\commons-lang-2.4.jar</binary-origin>
+ <runtime-relative-path>ext/lucene-sandbox-4.0.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/lucene-sandbox-4.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\commons-logging-1.2.jar</binary-origin>
+ <runtime-relative-path>ext/httpmime-4.5.10.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/httpmime-4.5.10.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jericho-html-3.3.jar</runtime-relative-path>
<binary-origin>release\modules\ext\jericho-html-3.3.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/httpcore-4.4.10.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\httpcore-4.4.10.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/slf4j-api-1.7.6.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\slf4j-api-1.7.6.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\commons-beanutils-1.9.2.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-io-2.3.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\commons-io-2.3.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/wstx-asl-3.2.7.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\wstx-asl-3.2.7.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/annotations-12.0.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\annotations-12.0.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/commons-collections-3.2.2.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/openaifsm-0.0.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/openaifsm-0.0.1.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/stax2-api-3.1.4.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/stax2-api-3.1.4.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/findstructapi-0.0.1.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/findstructapi-0.0.1.jar</binary-origin>
- </class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/jcommander-1.35.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/jcommander-1.35.jar</binary-origin>
+ <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/vorbis-java-core-0.8.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/vorbis-java-core-0.8.jar</binary-origin>
+ <runtime-relative-path>ext/cdm-4.5.5.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/cdm-4.5.5.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/netcdf4-4.5.5.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/netcdf4-4.5.5.jar</binary-origin>
+ <runtime-relative-path>ext/httpservices-4.5.5.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/httpservices-4.5.5.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/java-libpst-0.8.1.jar</runtime-relative-path>
@@ -371,6 +267,10 @@
<runtime-relative-path>ext/lucene-queries-4.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/lucene-queries-4.0.0.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/boilerpipe-1.1.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/boilerpipe-1.1.0.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/juniversalchardet-1.0.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/juniversalchardet-1.0.3.jar</binary-origin>
@@ -379,14 +279,38 @@
<runtime-relative-path>ext/commons-lang-2.6.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-lang-2.6.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/quartz-2.2.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/quartz-2.2.0.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/libsvm-3.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/libsvm-3.1.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/slf4j-api-1.7.25.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/slf4j-api-1.7.25.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/icu4j-3.8.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/icu4j-3.8.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/poi-4.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/poi-4.0.1.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\language-detector-0.6.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/guava-18.0.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/guava-18.0.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/joda-time-2.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/joda-time-2.2.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jcip-annotations-1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jcip-annotations-1.0.jar</binary-origin>
@@ -395,6 +319,10 @@
<runtime-relative-path>ext/commons-validator-1.5.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-validator-1.5.1.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/commons-logging-1.2.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\commons-logging-1.2.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/bzip2-0.9.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/bzip2-0.9.1.jar</binary-origin>
@@ -415,10 +343,6 @@
<runtime-relative-path>ext/jdom-1.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/jdom-1.0.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/solr-solrj-8.6.2.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/solr-solrj-8.6.2.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/commons-beanutils-1.9.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-beanutils-1.9.2.jar</binary-origin>
@@ -436,17 +360,41 @@
<binary-origin>release/modules/ext/zookeeper-3.5.7.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/language-detector-0.6.jar</runtime-relative-path>
- <binary-origin>release\modules\ext\language-detector-0.6.jar</binary-origin>
+ <runtime-relative-path>ext/commons-collections-3.2.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/commons-collections-3.2.2.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/commons-io-2.6.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/commons-io-2.6.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/annotations-12.0.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\annotations-12.0.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/openaifsm-0.0.1.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/openaifsm-0.0.1.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/stax2-api-3.1.4.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/stax2-api-3.1.4.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/httpclient-4.5.10.jar</runtime-relative-path>
<binary-origin>release/modules/ext/httpclient-4.5.10.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/solr-solrj-8.6.3.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/solr-solrj-8.6.3.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/vorbis-java-tika-0.8.jar</runtime-relative-path>
<binary-origin>release/modules/ext/vorbis-java-tika-0.8.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
+ </class-path-extension>
</data>
</configuration>
</project>
diff --git a/KeywordSearch/solr/bin/autopsy-solr.cmd b/KeywordSearch/solr/bin/autopsy-solr.cmd
deleted file mode 100755
index 018a626694d22a960e5482adf8cb442e9ea1d3df..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/bin/autopsy-solr.cmd
+++ /dev/null
@@ -1,2032 +0,0 @@
-@REM set JAVA_HOME=C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1
-@REM set SOLR_SERVER_DIR=C:\Bitnami\solr-8.2.0-2/apache-solr/server
-set SOLR_PORT=8983
-set STOP_PORT=8079
-
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-
-IF "%OS%"=="Windows_NT" setlocal enabledelayedexpansion enableextensions
-
-set "PASS_TO_RUN_EXAMPLE="
-
-REM Determine top-level Solr directory
-set SDIR=%~dp0
-IF "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
-set SOLR_TIP=%SDIR%\..
-pushd %SOLR_TIP%
-set SOLR_TIP=%CD%
-popd
-
-REM Used to report errors before exiting the script
-set SCRIPT_ERROR=
-set NO_USER_PROMPT=0
-
-REM Allow user to import vars from an include file
-REM vars set in the include file can be overridden with
-REM command line args
-IF "%SOLR_INCLUDE%"=="" set "SOLR_INCLUDE=%SOLR_TIP%\bin\autopsy-solr.in.cmd"
-IF EXIST "%SOLR_INCLUDE%" CALL "%SOLR_INCLUDE%"
-
-set "DEFAULT_SERVER_DIR=%SOLR_TIP%\server"
-
-REM Select HTTP OR HTTPS related configurations
-set SOLR_URL_SCHEME=http
-set "SOLR_JETTY_CONFIG=--module=http"
-set "SOLR_SSL_OPTS= "
-
-IF DEFINED SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dhadoop.security.credential.provider.path=%SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH%"
-)
-
-IF NOT DEFINED SOLR_SSL_ENABLED (
- IF DEFINED SOLR_SSL_KEY_STORE (
- set "SOLR_SSL_ENABLED=true"
- ) ELSE (
- set "SOLR_SSL_ENABLED=false"
- )
-)
-
-IF "%SOLR_SSL_ENABLED%"=="true" (
- set "SOLR_JETTY_CONFIG=--lib="%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*""
- if !JAVA_MAJOR_VERSION! GEQ 9 (
- set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https"
- ) else (
- set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=https8"
- )
- set SOLR_URL_SCHEME=https
- IF DEFINED SOLR_SSL_KEY_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.keystore=%SOLR_SSL_KEY_STORE%"
- )
-
- IF DEFINED SOLR_SSL_KEY_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.keystore.type=%SOLR_SSL_KEY_STORE_TYPE%"
- )
-
- IF DEFINED SOLR_SSL_TRUST_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.truststore=%SOLR_SSL_TRUST_STORE%"
- )
- IF DEFINED SOLR_SSL_TRUST_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.truststore.type=%SOLR_SSL_TRUST_STORE_TYPE%"
- )
-
- IF DEFINED SOLR_SSL_NEED_CLIENT_AUTH (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.needClientAuth=%SOLR_SSL_NEED_CLIENT_AUTH%"
- )
- IF DEFINED SOLR_SSL_WANT_CLIENT_AUTH (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.wantClientAuth=%SOLR_SSL_WANT_CLIENT_AUTH%"
- )
-
- IF DEFINED SOLR_SSL_CLIENT_KEY_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.keyStore=%SOLR_SSL_CLIENT_KEY_STORE%"
-
- IF DEFINED SOLR_SSL_CLIENT_KEY_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.keyStoreType=%SOLR_SSL_CLIENT_KEY_STORE_TYPE%"
- )
- ) ELSE (
- IF DEFINED SOLR_SSL_KEY_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.keyStore=%SOLR_SSL_KEY_STORE%"
- )
- IF DEFINED SOLR_SSL_KEY_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.keyStoreType=%SOLR_SSL_KEY_STORE_TYPE%"
- )
- )
-
- IF DEFINED SOLR_SSL_CLIENT_TRUST_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.trustStore=%SOLR_SSL_CLIENT_TRUST_STORE%"
-
- IF DEFINED SOLR_SSL_CLIENT_TRUST_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.trustStoreType=%SOLR_SSL_CLIENT_TRUST_STORE_TYPE%"
- )
- ) ELSE (
- IF DEFINED SOLR_SSL_TRUST_STORE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.trustStore=%SOLR_SSL_TRUST_STORE%"
- )
- IF DEFINED SOLR_SSL_TRUST_STORE_TYPE (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Djavax.net.ssl.trustStoreType=%SOLR_SSL_TRUST_STORE_TYPE%"
- )
- )
- IF DEFINED SOLR_SSL_CHECK_PEER_NAME (
- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.ssl.checkPeerName=%SOLR_SSL_CHECK_PEER_NAME%"
- )
-) ELSE (
- set SOLR_SSL_OPTS=
-)
-
-REM Authentication options
-
-IF NOT DEFINED SOLR_AUTH_TYPE (
- IF DEFINED SOLR_AUTHENTICATION_OPTS (
- echo WARNING: SOLR_AUTHENTICATION_OPTS variable configured without associated SOLR_AUTH_TYPE variable
- echo Please configure SOLR_AUTH_TYPE variable with the authentication type to be used.
- echo Currently supported authentication types are [kerberos, basic]
- )
-)
-
-IF DEFINED SOLR_AUTH_TYPE (
- IF DEFINED SOLR_AUTHENTICATION_CLIENT_BUILDER (
- echo WARNING: SOLR_AUTHENTICATION_CLIENT_BUILDER and SOLR_AUTH_TYPE variables are configured together
- echo Use SOLR_AUTH_TYPE variable to configure authentication type to be used
- echo Currently supported authentication types are [kerberos, basic]
- echo The value of SOLR_AUTHENTICATION_CLIENT_BUILDER configuration variable will be ignored
- )
-)
-
-IF DEFINED SOLR_AUTH_TYPE (
- IF /I "%SOLR_AUTH_TYPE%" == "basic" (
- set SOLR_AUTHENTICATION_CLIENT_BUILDER="org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory"
- ) ELSE (
- IF /I "%SOLR_AUTH_TYPE%" == "kerberos" (
- set SOLR_AUTHENTICATION_CLIENT_BUILDER="org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory"
- ) ELSE (
- echo ERROR: Value specified for SOLR_AUTH_TYPE configuration variable is invalid.
- goto err
- )
- )
-)
-
-IF DEFINED SOLR_AUTHENTICATION_CLIENT_CONFIGURER (
- echo WARNING: Found unsupported configuration variable SOLR_AUTHENTICATION_CLIENT_CONFIGURER
- echo Please start using SOLR_AUTH_TYPE instead
-)
-IF DEFINED SOLR_AUTHENTICATION_CLIENT_BUILDER (
- set AUTHC_CLIENT_BUILDER_ARG="-Dsolr.httpclient.builder.factory=%SOLR_AUTHENTICATION_CLIENT_BUILDER%"
-)
-set "AUTHC_OPTS=%AUTHC_CLIENT_BUILDER_ARG% %SOLR_AUTHENTICATION_OPTS%"
-
-REM Set the SOLR_TOOL_HOST variable for use when connecting to a running Solr instance
-IF NOT "%SOLR_HOST%"=="" (
- set "SOLR_TOOL_HOST=%SOLR_HOST%"
-) ELSE (
- set "SOLR_TOOL_HOST=localhost"
-)
-IF "%SOLR_JETTY_HOST%"=="" (
- set SOLR_JETTY_HOST=0.0.0.0
-)
-
-REM Verify Java is available
-IF DEFINED SOLR_JAVA_HOME set "JAVA_HOME=%SOLR_JAVA_HOME%"
-REM Try to detect JAVA_HOME from the registry
-IF NOT DEFINED JAVA_HOME (
- FOR /F "skip=2 tokens=2*" %%A IN ('REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment" /v CurrentVersion') DO set CurVer=%%B
- FOR /F "skip=2 tokens=2*" %%A IN ('REG QUERY "HKLM\Software\JavaSoft\Java Runtime Environment\!CurVer!" /v JavaHome') DO (
- set "JAVA_HOME=%%B"
- )
-)
-IF NOT DEFINED JAVA_HOME goto need_java_home
-set JAVA_HOME=%JAVA_HOME:"=%
-IF %JAVA_HOME:~-1%==\ SET JAVA_HOME=%JAVA_HOME:~0,-1%
-IF NOT EXIST "%JAVA_HOME%\bin\java.exe" (
- set "SCRIPT_ERROR=java.exe not found in %JAVA_HOME%\bin. Please set JAVA_HOME to a valid JRE / JDK directory."
- goto err
-)
-set "JAVA=%JAVA_HOME%\bin\java"
-CALL :resolve_java_info
-IF !JAVA_MAJOR_VERSION! LSS 8 (
- set "SCRIPT_ERROR=Java 1.8 or later is required to run Solr. Current Java version is: !JAVA_VERSION_INFO! (detected major: !JAVA_MAJOR_VERSION!)"
- goto err
-)
-
-set FIRST_ARG=%1
-
-IF [%1]==[] goto usage
-
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-IF "%1"=="-h" goto usage
-IF "%1"=="--help" goto usage
-IF "%1"=="/?" goto usage
-IF "%1"=="-i" goto get_info
-IF "%1"=="-info" goto get_info
-IF "%1"=="status" goto get_info
-IF "%1"=="version" goto get_version
-IF "%1"=="-v" goto get_version
-IF "%1"=="-version" goto get_version
-IF "%1"=="assert" goto run_assert
-IF "%1"=="autoscaling" goto run_autoscaling
-
-REM Only allow the command to be the first argument, assume start if not supplied
-IF "%1"=="start" goto set_script_cmd
-IF "%1"=="stop" goto set_script_cmd
-IF "%1"=="restart" goto set_script_cmd
-IF "%1"=="healthcheck" (
- REM healthcheck uses different arg parsing strategy
- set SCRIPT_CMD=healthcheck
- SHIFT
- goto parse_healthcheck_args
-)
-IF "%1"=="create" (
- set SCRIPT_CMD=create
- SHIFT
- goto parse_create_args
-)
-IF "%1"=="create_core" (
- set SCRIPT_CMD=create_core
- SHIFT
- goto parse_create_args
-)
-IF "%1"=="create_collection" (
- set SCRIPT_CMD=create_collection
- SHIFT
- goto parse_create_args
-)
-IF "%1"=="delete" (
- set SCRIPT_CMD=delete
- SHIFT
- goto parse_delete_args
-)
-IF "%1"=="zk" (
- set SCRIPT_CMD=zk
- SHIFT
- set ZK_RECURSE=false
- goto parse_zk_args
-)
-IF "%1"=="auth" (
- set SCRIPT_CMD=auth
- SHIFT
- goto run_auth
-)
-IF "%1"=="config" (
- REM config uses different arg parsing strategy
- set SCRIPT_CMD=config
- SHIFT
- set CONFIG_ARGS=
- goto parse_config_args
-)
-
-goto parse_args
-
-:usage
-IF NOT "%SCRIPT_ERROR%"=="" ECHO %SCRIPT_ERROR%
-IF [%FIRST_ARG%]==[] goto script_usage
-IF "%FIRST_ARG%"=="-help" goto script_usage
-IF "%FIRST_ARG%"=="-usage" goto script_usage
-IF "%FIRST_ARG%"=="-h" goto script_usage
-IF "%FIRST_ARG%"=="--help" goto script_usage
-IF "%FIRST_ARG%"=="/?" goto script_usage
-IF "%SCRIPT_CMD%"=="start" goto start_usage
-IF "%SCRIPT_CMD%"=="restart" goto start_usage
-IF "%SCRIPT_CMD%"=="stop" goto stop_usage
-IF "%SCRIPT_CMD%"=="healthcheck" goto healthcheck_usage
-IF "%SCRIPT_CMD%"=="create" goto create_usage
-IF "%SCRIPT_CMD%"=="create_core" goto create_core_usage
-IF "%SCRIPT_CMD%"=="create_collection" goto create_collection_usage
-IF "%SCRIPT_CMD%"=="delete" goto delete_usage
-IF "%SCRIPT_CMD%"=="zk" goto zk_usage
-IF "%SCRIPT_CMD%"=="auth" goto auth_usage
-IF "%SCRIPT_CMD%"=="status" goto status_usage
-goto done
-
-:script_usage
-@echo.
-@echo Usage: solr COMMAND OPTIONS
-@echo where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling
-@echo.
-@echo Standalone server example (start Solr running in the background on port 8984):
-@echo.
-@echo solr start -p 8984
-@echo.
-@echo SolrCloud example (start Solr running in SolrCloud mode using localhost:2181 to connect to Zookeeper, with 1g max heap size and remote Java debug options enabled):
-@echo.
-@echo solr start -c -m 1g -z localhost:2181 -a "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044"
-@echo.
-@echo Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.cmd.
-@echo.
-@echo Pass -help after any COMMAND to see command-specific usage information,
-@echo such as: solr start -help or solr stop -help
-@echo.
-goto done
-
-:start_usage
-@echo.
-@echo Usage: solr %SCRIPT_CMD% [-f] [-c] [-h hostname] [-p port] [-d directory] [-z zkHost] [-m memory] [-e example] [-s solr.solr.home] [-t solr.data.home] [-a "additional-options"] [-V]
-@echo.
-@echo -f Start Solr in foreground; default starts Solr in the background
-@echo and sends stdout / stderr to solr-PORT-console.log
-@echo.
-@echo -c or -cloud Start Solr in SolrCloud mode; if -z not supplied and ZK_HOST not defined in
-@echo solr.in.cmd, an embedded ZooKeeper instance is started on Solr port+1000,
-@echo such as 9983 if Solr is bound to 8983
-@echo.
-@echo -h host Specify the hostname for this Solr instance
-@echo.
-@echo -p port Specify the port to start the Solr HTTP listener on; default is 8983
-@echo " The specified port (SOLR_PORT) will also be used to determine the stop port"
-@echo " STOP_PORT=(\$SOLR_PORT-1000) and JMX RMI listen port RMI_PORT=(\$SOLR_PORT+10000). "
-@echo " For instance, if you set -p 8985, then the STOP_PORT=7985 and RMI_PORT=18985"
-@echo.
-@echo -d dir Specify the Solr server directory; defaults to server
-@echo.
-@echo -z zkHost Zookeeper connection string; only used when running in SolrCloud mode using -c
-@echo If neither ZK_HOST is defined in solr.in.cmd nor the -z parameter is specified,
-@echo an embedded ZooKeeper instance will be launched.
-@echo.
-@echo -m memory Sets the min (-Xms) and max (-Xmx) heap size for the JVM, such as: -m 4g
-@echo results in: -Xms4g -Xmx4g; by default, this script sets the heap size to 512m
-@echo.
-@echo -s dir Sets the solr.solr.home system property; Solr will create core directories under
-@echo this directory. This allows you to run multiple Solr instances on the same host
-@echo while reusing the same server directory set using the -d parameter. If set, the
-@echo specified directory should contain a solr.xml file, unless solr.xml exists in Zookeeper.
-@echo This parameter is ignored when running examples (-e), as the solr.solr.home depends
-@echo on which example is run. The default value is server/solr. If passed a relative dir
-@echo validation with the current dir will be done before trying the default server/^<dir^>
-@echo.
-@echo -t dir Sets the solr.data.home system property, where Solr will store index data in ^<instance_dir^>/data subdirectories.
-@echo If not set, Solr uses solr.solr.home for both config and data.
-@echo.
-@echo -e example Name of the example to run; available examples:
-@echo cloud: SolrCloud example
-@echo techproducts: Comprehensive example illustrating many of Solr's core capabilities
-@echo dih: Data Import Handler
-@echo schemaless: Schema-less example
-@echo.
-@echo -a opts Additional parameters to pass to the JVM when starting Solr, such as to setup
-@echo Java debug options. For example, to enable a Java debugger to attach to the Solr JVM
-@echo you could pass: -a "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=18983"
-@echo In most cases, you should wrap the additional parameters in double quotes.
-@echo.
-@echo -j opts Additional parameters to pass to Jetty when starting Solr.
-@echo For example, to add configuration folder that jetty should read
-@echo you could pass: -j "--include-jetty-dir=/etc/jetty/custom/server/"
-@echo In most cases, you should wrap the additional parameters in double quotes.
-@echo.
-@echo -noprompt Don't prompt for input; accept all defaults when running examples that accept user input
-@echo.
-@echo -v and -q Verbose (-v) or quiet (-q) logging. Sets default log level to DEBUG or WARN instead of INFO
-@echo.
-@echo -V/-verbose Verbose messages from this script
-@echo.
-goto done
-
-:status_usage
-@echo.
-@echo Usage: solr status
-@echo.
-@echo NOTE: This command will show the status of all running Solr servers
-@echo.
-goto done
-
-:stop_usage
-@echo.
-@echo Usage: solr stop [-k key] [-p port] [-V]
-@echo.
-@echo -k key Stop key; default is solrrocks
-@echo.
-@echo -p port Specify the port the Solr HTTP listener is bound to
-@echo.
-@echo -all Find and stop all running Solr servers on this host
-@echo.
-@echo -V/-verbose Verbose messages from this script
-@echo.
-@echo NOTE: To see if any Solr servers are running, do: solr status
-@echo.
-goto done
-
-:healthcheck_usage
-@echo.
-@echo Usage: solr healthcheck [-c collection] [-z zkHost] [-V]
-@echo.
-@echo Can be run from remote (non-Solr^) hosts, as long as a proper ZooKeeper connection is provided
-@echo.
-@echo -c collection Collection to run healthcheck against.
-@echo.
-@echo -z zkHost Zookeeper connection string; unnecessary if ZK_HOST is defined in solr.in.cmd;
-@echo otherwise, default is localhost:9983
-@echo.
-@echo -V Enable more verbose output
-@echo.
-goto done
-
-:create_usage
-echo.
-echo Usage: solr create [-c name] [-d confdir] [-n confname] [-shards #] [-replicationFactor #] [-p port] [-V]
-echo.
-echo Create a core or collection depending on whether Solr is running in standalone (core) or SolrCloud
-echo mode (collection). In other words, this action detects which mode Solr is running in, and then takes
-echo the appropriate action (either create_core or create_collection). For detailed usage instructions, do:
-echo.
-echo bin\solr create_core -help
-echo.
-echo or
-echo.
-echo bin\solr create_collection -help
-echo.
-goto done
-
-:delete_usage
-echo.
-echo Usage: solr delete [-c name] [-deleteConfig true^|false] [-p port] [-V]
-echo.
-echo Deletes a core or collection depending on whether Solr is running in standalone (core) or SolrCloud
-echo mode (collection). If you're deleting a collection in SolrCloud mode, the default behavior is to also
-echo delete the configuration directory from Zookeeper so long as it is not being used by another collection.
-echo You can override this behavior by passing -deleteConfig false when running this command.
-echo.
-echo Can be run on remote (non-Solr^) hosts, as long as a valid SOLR_HOST is provided in solr.in.cmd
-echo.
-echo -c name Name of core to delete
-echo.
-echo -deleteConfig boolean Delete the configuration directory from Zookeeper; default is true
-echo.
-echo -p port Port of a local Solr instance where you want to delete the core/collection
-echo If not specified, the script will search the local system for a running
-echo Solr instance and will use the port of the first server it finds.
-echo.
-echo -V Enables more verbose output.
-echo.
-goto done
-
-:create_core_usage
-echo.
-echo Usage: solr create_core [-c ^<core^>] [-d confdir] [-p port] [-V]
-echo.
-echo When a configSet is used, this can be run from any host. If pointing at a non-configSet directory, this
-echo must be run from the host that you wish to create the core on.
-echo.
-echo -c ^<core^> Name of core to create
-echo.
-echo -d confdir Configuration directory to copy when creating the new core, built-in options are:
-echo.
-echo _default: Minimal configuration, which supports enabling/disabling field-guessing support
-echo sample_techproducts_configs: Example configuration with many optional features enabled to
-echo demonstrate the full power of Solr
-echo.
-echo If not specified, default is: _default
-echo.
-echo Alternatively, you can pass the path to your own configuration directory instead of using
-echo one of the built-in configurations, such as: bin\solr create_core -c mycore -d c:/tmp/myconfig
-echo.
-echo -p port Port of a local Solr instance where you want to create the new core
-echo If not specified, the script will search the local system for a running
-echo Solr instance and will use the port of the first server it finds.
-echo.
-echo -V Enable more verbose output.
-echo.
-goto done
-
-:create_collection_usage
-echo.
-echo Usage: solr create_collection [-c collection] [-d confdir] [-n confname] [-shards #] [-replicationFactor #] [-p port] [-V]
-echo.
-echo Can be run from remote (non-Solr^) hosts, as long as a valid SOLR_HOST is provided in solr.in.cmd.
-echo.
-echo -c ^<collection^> Name of collection to create
-echo.
-echo -d ^<confdir^> Configuration directory to copy when creating the new collection, built-in options are:
-echo.
-echo _default: Minimal configuration, which supports enabling/disabling field-guessing support
-echo sample_techproducts_configs: Example configuration with many optional features enabled to
-echo demonstrate the full power of Solr
-echo.
-echo If not specified, default is: _default
-echo.
-echo Alternatively, you can pass the path to your own configuration directory instead of using
-echo one of the built-in configurations, such as: bin\solr create_collection -c mycoll -d c:/tmp/myconfig
-echo.
-echo By default the script will upload the specified confdir directory into Zookeeper using the same
-echo name as the collection (-c) option. Alternatively, if you want to reuse an existing directory
-echo or create a confdir in Zookeeper that can be shared by multiple collections, use the -n option
-echo.
-echo -n configName Name the configuration directory in Zookeeper; by default, the configuration
-echo will be uploaded to Zookeeper using the collection name (-c), but if you want
-echo to use an existing directory or override the name of the configuration in
-echo Zookeeper, then use the -c option.
-echo.
-echo -shards # Number of shards to split the collection into; default is 1
-echo.
-echo -replicationFactor # Number of copies of each document in the collection, default is 1 (no replication)
-echo.
-echo -p port Port of a local Solr instance where you want to create the new collection
-echo If not specified, the script will search the local system for a running
-echo Solr instance and will use the port of the first server it finds.
-echo.
-echo -V Enable more verbose output.
-echo.
-goto done
-
-:zk_usage
-set ZK_FULL=true
-goto zk_short_usage
-:zk_full_usage
-echo Can be run on remote (non-Solr^) hosts, as long as valid ZK_HOST information is provided.
-echo Be sure to check the Solr logs in case of errors.
-echo.
-echo -z zkHost Optional Zookeeper connection string for all commands. If specified it
-echo overrides the 'ZK_HOST=...'' defined in solr.in.cmd.
-echo.
-echo -V Enable more verbose output.
-echo.
-echo upconfig uploads a configset from the local machine to Zookeeper. (Backcompat: -upconfig)
-echo.
-echo downconfig downloads a configset from Zookeeper to the local machine. (Backcompat: -downconfig)
-echo.
-echo -n configName Name of the configset in Zookeeper that will be the destination of
-echo 'upconfig' and the source for 'downconfig'.
-echo.
-echo -d confdir The local directory the configuration will be uploaded from for
-echo 'upconfig' or downloaded to for 'downconfig'. If 'confdir' is a child of
-echo ...solr/server/solr/configsets' then the configs will be copied from/to
-echo that directory. Otherwise it is interpreted as a simple local path.
-echo.
-echo cp copies files or folders to/from Zookeeper or Zokeeper -^> Zookeeper
-echo -r Recursively copy ^<src^> to ^<dst^>. Command will fail if ^<src^> has children and
-echo -r is not specified. Optional
-echo.
-echo. ^<src^>, ^<dest^> : [file:][/]path/to/local/file or zk:/path/to/zk/node
-echo NOTE: ^<src^> and ^<dest^> may both be Zookeeper resources prefixed by 'zk:'
-echo When ^<src^> is a zk resource, ^<dest^> may be '.'
-echo If ^<dest^> ends with '/', then ^<dest^> will be a local folder or parent znode and the last
-echo element of the ^<src^> path will be appended unless ^<src^> also ends in a slash.
-echo ^<dest^> may be zk:, which may be useful when using the cp -r form to backup/restore
-echo the entire zk state.
-echo You must enclose local paths that end in a wildcard in quotes or just
-echo end the local path in a slash. That is,
-echo 'bin/solr zk cp -r /some/dir/ zk:/ -z localhost:2181' is equivalent to
-echo 'bin/solr zk cp -r ^"/some/dir/*^" zk:/ -z localhost:2181'
-echo but 'bin/solr zk cp -r /some/dir/* zk:/ -z localhost:2181' will throw an error.
-echo.
-echo Here's an example of backup/restore for a ZK configuration:
-echo to copy to local: 'bin/solr zk cp -r zk:/ /some/dir -z localhost:2181'
-echo to restore to ZK: 'bin/solr zk cp -r /some/dir/ zk:/ -z localhost:2181'
-echo.
-echo The 'file:' prefix is stripped, thus 'file:/wherever' specifies an absolute local path and
-echo 'file:somewhere' specifies a relative local path. All paths on Zookeeper are absolute.
-echo.
-echo Zookeeper nodes CAN have data, so moving a single file to a parent znode
-echo will overlay the data on the parent Znode so specifying the trailing slash
-echo can be important.
-echo.
-echo Wildcards are supported when copying from local, trailing only and must be quoted.
-echo.
-echo rm deletes files or folders on Zookeeper
-echo -r Recursively delete if ^<path^> is a directory. Command will fail if ^<path^>
-echo has children and -r is not specified. Optional
-echo ^<path^> : [zk:]/path/to/zk/node. ^<path^> may not be the root ('/')
-echo.
-echo mv moves (renames) znodes on Zookeeper
-echo ^<src^>, ^<dest^> : Zookeeper nodes, the 'zk:' prefix is optional.
-echo If ^<dest^> ends with '/', then ^<dest^> will be a parent znode
-echo and the last element of the ^<src^> path will be appended.
-echo Zookeeper nodes CAN have data, so moving a single file to a parent znode
-echo will overlay the data on the parent Znode so specifying the trailing slash
-echo is important.
-echo.
-echo ls lists the znodes on Zookeeper
-echo -r recursively descends the path listing all znodes. Optional
-echo ^<path^>: The Zookeeper path to use as the root.
-echo.
-echo Only the node names are listed, not data
-echo.
-echo mkroot makes a znode in Zookeeper with no data. Can be used to make a path of arbitrary
-echo depth but primarily intended to create a 'chroot'.
-echo.
-echo ^<path^>: The Zookeeper path to create. Leading slash is assumed if not present.
-echo Intermediate nodes are created as needed if not present.
-echo.
-
-goto done
-
-:zk_short_usage
-IF NOT "!ERROR_MSG!"=="" (
- echo ERROR: !ERROR_MSG!
- echo.
-)
-echo Usage: solr zk upconfig^|downconfig -d ^<confdir^> -n ^<configName^> [-z zkHost]
-echo solr zk cp [-r] ^<src^> ^<dest^> [-z zkHost]
-echo solr zk rm [-r] ^<path^> [-z zkHost]
-echo solr zk mv ^<src^> ^<dest^> [-z zkHost]
-echo solr zk ls [-r] ^<path^> [-z zkHost]
-echo solr zk mkroot ^<path^> [-z zkHost]
-echo.
-IF "%ZK_FULL%"=="true" (
- goto zk_full_usage
-) ELSE (
- echo Type bin/solr zk -help for full usage help
-)
-goto done
-
-:auth_usage
-echo Usage: solr auth enable [-type basicAuth] -credentials user:pass [-blockUnknown ^<true^|false^>] [-updateIncludeFileOnly ^<true^|false^>] [-V]
-echo solr auth enable [-type basicAuth] -prompt ^<true^|false^> [-blockUnknown ^<true^|false^>] [-updateIncludeFileOnly ^<true^|false^>] [-V]
-echo solr auth disable [-updateIncludeFileOnly ^<true^|false^>] [-V]
-echo.
-echo Updates or enables/disables authentication. Must be run on the machine hosting Solr.
-echo.
-echo -type ^<type^> The authentication mechanism to enable. Defaults to 'basicAuth'.
-echo.
-echo -credentials ^<user:pass^> The username and password of the initial user
-echo Note: only one of -prompt or -credentials must be provided
-echo.
-echo -prompt ^<true^|false^> Prompts the user to provide the credentials
-echo Note: only one of -prompt or -credentials must be provided
-echo.
-echo -blockUnknown ^<true^|false^> When true, this blocks out access to unauthenticated users. When not provided,
-echo this defaults to false (i.e. unauthenticated users can access all endpoints, except the
-echo operations like collection-edit, security-edit, core-admin-edit etc.^). Check the reference
-echo guide for Basic Authentication for more details.
-echo.
-echo -updateIncludeFileOnly ^<true^|false^> Only update the solr.in.sh or solr.in.cmd file, and skip actual enabling/disabling"
-echo authentication (i.e. don't update security.json^)"
-echo.
-echo -z zkHost Zookeeper connection string. Unnecessary if ZK_HOST is defined in solr.in.cmd.
-echo.
-echo -d ^<dir^> Specify the Solr server directory"
-echo.
-echo -s ^<dir^> Specify the Solr home directory. This is where any credentials or authentication"
-echo configuration files (e.g. basicAuth.conf^) would be placed."
-echo.
-echo -V Enable more verbose output
-echo.
-goto done
-
-REM Really basic command-line arg parsing
-:parse_args
-
-set "arg=%~1"
-set "firstTwo=%arg:~0,2%"
-IF "%SCRIPT_CMD%"=="" set SCRIPT_CMD=start
-IF [%1]==[] goto process_script_cmd
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-IF "%1"=="/?" goto usage
-IF "%1"=="-f" goto set_foreground_mode
-IF "%1"=="-foreground" goto set_foreground_mode
-IF "%1"=="-V" goto set_verbose
-IF "%1"=="-verbose" goto set_verbose
-IF "%1"=="-v" goto set_debug
-IF "%1"=="-q" goto set_warn
-IF "%1"=="-c" goto set_cloud_mode
-IF "%1"=="-cloud" goto set_cloud_mode
-IF "%1"=="-d" goto set_server_dir
-IF "%1"=="-dir" goto set_server_dir
-IF "%1"=="-s" goto set_solr_home_dir
-IF "%1"=="-t" goto set_solr_data_dir
-IF "%1"=="-solr.home" goto set_solr_home_dir
-IF "%1"=="-e" goto set_example
-IF "%1"=="-example" goto set_example
-IF "%1"=="-h" goto set_host
-IF "%1"=="-host" goto set_host
-IF "%1"=="-m" goto set_memory
-IF "%1"=="-memory" goto set_memory
-IF "%1"=="-p" goto set_port
-IF "%1"=="-port" goto set_port
-IF "%1"=="-z" goto set_zookeeper
-IF "%1"=="-zkhost" goto set_zookeeper
-IF "%1"=="-zkHost" goto set_zookeeper
-IF "%1"=="-a" goto set_addl_opts
-IF "%1"=="-addlopts" goto set_addl_opts
-IF "%1"=="-j" goto set_addl_jetty_config
-IF "%1"=="-jettyconfig" goto set_addl_jetty_config
-IF "%1"=="-noprompt" goto set_noprompt
-IF "%1"=="-k" goto set_stop_key
-IF "%1"=="-key" goto set_stop_key
-IF "%1"=="-all" goto set_stop_all
-IF "%firstTwo%"=="-D" goto set_passthru
-IF NOT "%1"=="" goto invalid_cmd_line
-goto invalid_cmd_line
-
-:set_script_cmd
-set SCRIPT_CMD=%1
-SHIFT
-goto parse_args
-
-:set_foreground_mode
-set FG=1
-SHIFT
-goto parse_args
-
-:set_verbose
-set verbose=1
-set "PASS_TO_RUN_EXAMPLE=--verbose !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-goto parse_args
-
-:set_debug
-set SOLR_LOG_LEVEL=DEBUG
-SHIFT
-goto parse_args
-
-:set_warn
-set SOLR_LOG_LEVEL=WARN
-SHIFT
-goto parse_args
-
-:set_cloud_mode
-set SOLR_MODE=solrcloud
-SHIFT
-goto parse_args
-
-:set_server_dir
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Directory name is required!
- goto invalid_cmd_line
-)
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected directory but found %2 instead!
- goto invalid_cmd_line
-)
-
-REM See if they are using a short-hand name relative from the Solr tip directory
-IF EXIST "%SOLR_TIP%\%~2" (
- set "SOLR_SERVER_DIR=%SOLR_TIP%\%~2"
-) ELSE (
- set "SOLR_SERVER_DIR=%~2"
-)
-SHIFT
-SHIFT
-goto parse_args
-
-:set_solr_home_dir
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Directory name is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected directory but found %2 instead!
- goto invalid_cmd_line
-)
-set "SOLR_HOME=%~2"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_solr_data_dir
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Directory name is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected directory but found %2 instead!
- goto invalid_cmd_line
-)
-set "SOLR_DATA_HOME=%~2"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_example
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Example name is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected example name but found %2 instead!
- goto invalid_cmd_line
-)
-
-set EXAMPLE=%~2
-SHIFT
-SHIFT
-goto parse_args
-
-:set_memory
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Memory setting is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected memory setting but found %2 instead!
- goto invalid_cmd_line
-)
-
-set SOLR_HEAP=%~2
-set "PASS_TO_RUN_EXAMPLE=-m %~2 !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_host
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Hostname is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected hostname but found %2 instead!
- goto invalid_cmd_line
-)
-
-set SOLR_HOST=%~2
-set "PASS_TO_RUN_EXAMPLE=-h %~2 !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_port
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Port is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected port but found %2 instead!
- goto invalid_cmd_line
-)
-
-set SOLR_PORT=%~2
-set "PASS_TO_RUN_EXAMPLE=-p %~2 !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_stop_key
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Stop key is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected stop key but found %2 instead!
- goto invalid_cmd_line
-)
-set STOP_KEY=%~2
-SHIFT
-SHIFT
-goto parse_args
-
-:set_stop_all
-set STOP_ALL=1
-SHIFT
-goto parse_args
-
-:set_zookeeper
-
-set "arg=%~2"
-IF "%arg%"=="" (
- set SCRIPT_ERROR=Zookeeper connection string is required!
- goto invalid_cmd_line
-)
-
-set firstChar=%arg:~0,1%
-IF "%firstChar%"=="-" (
- set SCRIPT_ERROR=Expected Zookeeper connection string but found %2 instead!
- goto invalid_cmd_line
-)
-
-set "ZK_HOST=%~2"
-set "PASS_TO_RUN_EXAMPLE=-z %~2 !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_addl_opts
-set "arg=%~2"
-set "SOLR_ADDL_ARGS=%~2"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_addl_jetty_config
-set "arg=%~2"
-set "SOLR_JETTY_ADDL_CONFIG=%~2"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_passthru
-set "PASSTHRU=%~1=%~2"
-IF NOT "%SOLR_OPTS%"=="" (
- set "SOLR_OPTS=%SOLR_OPTS% %PASSTHRU%"
-) ELSE (
- set "SOLR_OPTS=%PASSTHRU%"
-)
-set "PASS_TO_RUN_EXAMPLE=%PASSTHRU% !PASS_TO_RUN_EXAMPLE!"
-SHIFT
-SHIFT
-goto parse_args
-
-:set_noprompt
-set NO_USER_PROMPT=1
-set "PASS_TO_RUN_EXAMPLE=-noprompt !PASS_TO_RUN_EXAMPLE!"
-
-SHIFT
-goto parse_args
-
-REM Perform the requested command after processing args
-:process_script_cmd
-
-IF "%verbose%"=="1" (
- CALL :safe_echo "Using Solr root directory: %SOLR_TIP%"
- CALL :safe_echo "Using Java: %JAVA%"
- "%JAVA%" -version
- @echo.
-)
-
-IF NOT "%SOLR_HOST%"=="" (
- set SOLR_HOST_ARG=-Dhost=%SOLR_HOST%
-) ELSE (
- set SOLR_HOST_ARG=
-)
-
-IF "%SOLR_SERVER_DIR%"=="" set "SOLR_SERVER_DIR=%DEFAULT_SERVER_DIR%"
-
-IF NOT EXIST "%SOLR_SERVER_DIR%" (
- set "SCRIPT_ERROR=Solr server directory %SOLR_SERVER_DIR% not found!"
- goto err
-)
-
-IF NOT "%EXAMPLE%"=="" goto run_example
-
-:start_solr
-IF "%SOLR_HOME%"=="" set "SOLR_HOME=%SOLR_SERVER_DIR%\solr"
-IF EXIST "%cd%\%SOLR_HOME%" set "SOLR_HOME=%cd%\%SOLR_HOME%"
-
-IF NOT EXIST "%SOLR_HOME%\" (
- IF EXIST "%SOLR_SERVER_DIR%\%SOLR_HOME%" (
- set "SOLR_HOME=%SOLR_SERVER_DIR%\%SOLR_HOME%"
- ) ELSE (
- set "SCRIPT_ERROR=Solr home directory %SOLR_HOME% not found!"
- goto err
- )
-)
-
-IF "%STOP_KEY%"=="" set STOP_KEY=solrrocks
-
-@REM This is quite hacky, but examples rely on a different log4j2.xml
-@REM so that we can write logs for examples to %SOLR_HOME%\..\logs
-@REM IF [%SOLR_LOGS_DIR%] == [] (
-@REM set "SOLR_LOGS_DIR=%SOLR_SERVER_DIR%\logs"
-@REM ) ELSE (
-@REM set SOLR_LOGS_DIR=%SOLR_LOGS_DIR:"=%
-@REM )
-
-set "SOLR_LOGS_DIR=%APPDATA%\autopsy\var\log\solr"
-
-set "EXAMPLE_DIR=%SOLR_TIP%\example"
-set TMP_SOLR_HOME=!SOLR_HOME:%EXAMPLE_DIR%=!
-IF NOT "%TMP_SOLR_HOME%"=="%SOLR_HOME%" (
- set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"
- set "LOG4J_CONFIG=file:///%SOLR_SERVER_DIR%\resources\log4j2.xml"
-)
-
-set IS_RESTART=0
-IF "%SCRIPT_CMD%"=="restart" (
- IF "%SOLR_PORT%"=="" (
- set "SCRIPT_ERROR=Must specify the port when trying to restart Solr."
- goto err
- )
- set SCRIPT_CMD=stop
- set IS_RESTART=1
-)
-
-@REM stop logic here
-IF "%SCRIPT_CMD%"=="stop" (
- IF "%SOLR_PORT%"=="" (
- IF "%STOP_ALL%"=="1" (
- set found_it=0
- for /f "usebackq" %%i in (`dir /b "%SOLR_LOGS_DIR%" ^| findstr /i "^solr-.*\.port$"`) do (
- set SOME_SOLR_PORT=
- For /F "delims=" %%J In ('type "%SOLR_TIP%\bin\%%i"') do set SOME_SOLR_PORT=%%~J
- if NOT "!SOME_SOLR_PORT!"=="" (
- for /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- @REM j is the ip:port and k is the pid
- IF NOT "%%k"=="0" (
- IF "%%j"=="%SOLR_JETTY_HOST%:!SOME_SOLR_PORT!" (
- set found_it=1
- @echo Stopping Solr process %%k running on port !SOME_SOLR_PORT!
- IF "%STOP_PORT%"=="" set /A STOP_PORT=!SOME_SOLR_PORT! - 1000
- "%JAVA%" %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
- del "%SOLR_LOGS_DIR%"\solr-!SOME_SOLR_PORT!.port
- timeout /T 5
- REM Kill it if it is still running after the graceful shutdown
- For /f "tokens=2,5" %%M in ('netstat -nao ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF "%%N"=="%%k" (
- IF "%%M"=="%SOLR_JETTY_HOST%:!SOME_SOLR_PORT!" (
- @echo Forcefully killing process %%N
- taskkill /f /PID %%N
- )
- )
- )
- )
- )
- )
- )
- )
- if "!found_it!"=="0" echo No Solr nodes found to stop.
- ) ELSE (
- set "SCRIPT_ERROR=Must specify the port when trying to stop Solr, or use -all to stop all running nodes on this host."
- goto err
- )
- ) ELSE (
- set found_it=0
- For /f "tokens=2,5" %%M in ('netstat -nao ^| find "TCP " ^| find ":0 " ^| find ":%SOLR_PORT% "') do (
- IF NOT "%%N"=="0" (
- IF "%%M"=="%SOLR_JETTY_HOST%:%SOLR_PORT%" (
- set found_it=1
- @echo Stopping Solr process %%N running on port %SOLR_PORT%
- IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000
- "%JAVA%" %SOLR_SSL_OPTS% -Djetty.home="%SOLR_SERVER_DIR%" -jar "%SOLR_SERVER_DIR%\start.jar" %SOLR_JETTY_CONFIG% STOP.PORT=!STOP_PORT! STOP.KEY=%STOP_KEY% --stop
- del "%SOLR_LOGS_DIR%"\solr-%SOLR_PORT%.port
- timeout /T 5
- REM Kill it if it is still running after the graceful shutdown
- For /f "tokens=2,5" %%j in ('netstat -nao ^| find "TCP " ^| find ":0 " ^| find ":%SOLR_PORT% "') do (
- IF "%%N"=="%%k" (
- IF "%%j"=="%SOLR_JETTY_HOST%:%SOLR_PORT%" (
- @echo Forcefully killing process %%N
- taskkill /f /PID %%N
- )
- )
- )
- )
- )
- )
- if "!found_it!"=="0" echo No Solr found running on port %SOLR_PORT%
- )
-
- IF "!IS_RESTART!"=="0" goto done
-)
-
-IF "!IS_RESTART!"=="1" set SCRIPT_CMD=start
-
-IF "%SOLR_PORT%"=="" set SOLR_PORT=8983
-IF "%STOP_PORT%"=="" set /A STOP_PORT=%SOLR_PORT% - 1000
-
-IF "%SCRIPT_CMD%"=="start" (
- REM see if Solr is already running using netstat
- For /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":%SOLR_PORT% "') do (
- IF NOT "%%k"=="0" (
- IF "%%j"=="%SOLR_JETTY_HOST%:%SOLR_PORT%" (
- set "SCRIPT_ERROR=Process %%k is already listening on port %SOLR_PORT%. If this is Solr, please stop it first before starting (or use restart). If this is not Solr, then please choose a different port using -p PORT"
- goto err
- )
- )
- )
-)
-
-@REM determine if -server flag is supported by current JVM
-"%JAVA%" -server -version > nul 2>&1
-IF ERRORLEVEL 1 (
- set IS_JDK=false
- set "SERVEROPT="
- @echo WARNING: You are using a JRE without support for -server option. Please upgrade to latest JDK for best performance
- @echo.
-) ELSE (
- set IS_JDK=true
- set "SERVEROPT=-server"
-)
-if !JAVA_MAJOR_VERSION! LSS 9 (
- "%JAVA%" -d64 -version > nul 2>&1
- IF ERRORLEVEL 1 (
- set "IS_64BIT=false"
- @echo WARNING: 32-bit Java detected. Not recommended for production. Point your JAVA_HOME to a 64-bit JDK
- @echo.
- ) ELSE (
- set IS_64bit=true
- )
-) ELSE (
- set IS_64bit=true
-)
-
-REM Clean up and rotate logs. Default to false since 7.4 as log4j2 handles startup rotation
-IF [%SOLR_LOG_PRESTART_ROTATION%] == [] (
- set SOLR_LOG_PRESTART_ROTATION=false
-)
-IF [%SOLR_LOG_PRESTART_ROTATION%] == [true] (
- REM Enable any of these if you require old remove/archive behavior
- REM call :run_utils "-remove_old_solr_logs 7" || echo "Failed removing old solr logs"
- REM call :run_utils "-archive_gc_logs" || echo "Failed archiving old GC logs"
- REM call :run_utils "-archive_console_logs" || echo "Failed archiving old console logs"
- call :run_utils "-rotate_solr_logs 9" || echo "Failed rotating old solr logs"
-)
-
-IF NOT "%ZK_HOST%"=="" set SOLR_MODE=solrcloud
-
-IF "%SOLR_MODE%"=="solrcloud" (
- IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=15000"
-
- set "CLOUD_MODE_OPTS=-DzkClientTimeout=!ZK_CLIENT_TIMEOUT!"
-
- IF NOT "%ZK_HOST%"=="" (
- set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -DzkHost=%ZK_HOST%"
- ) ELSE (
- IF "%verbose%"=="1" echo Configuring SolrCloud to launch an embedded Zookeeper using -DzkRun
- set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -DzkRun"
- )
- IF EXIST "%SOLR_HOME%\collection1\core.properties" set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -Dbootstrap_confdir=./solr/collection1/conf -Dcollection.configName=myconf -DnumShards=1"
-) ELSE (
- set CLOUD_MODE_OPTS=
- IF NOT EXIST "%SOLR_HOME%\solr.xml" (
- set "SCRIPT_ERROR=Solr home directory %SOLR_HOME% must contain solr.xml!"
- goto err
- )
-)
-
-REM These are useful for attaching remove profilers like VisualVM/JConsole
-IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
- IF "!RMI_PORT!"=="" set RMI_PORT=1%SOLR_PORT%
- set REMOTE_JMX_OPTS=-Dcom.sun.management.jmxremote ^
--Dcom.sun.management.jmxremote.local.only=false ^
--Dcom.sun.management.jmxremote.ssl=false ^
--Dcom.sun.management.jmxremote.authenticate=false ^
--Dcom.sun.management.jmxremote.port=!RMI_PORT! ^
--Dcom.sun.management.jmxremote.rmi.port=!RMI_PORT!
-
- IF NOT "%SOLR_HOST%"=="" set REMOTE_JMX_OPTS=%REMOTE_JMX_OPTS% -Djava.rmi.server.hostname=%SOLR_HOST%
-) ELSE (
- set REMOTE_JMX_OPTS=
-)
-
-IF NOT "%SOLR_HEAP%"=="" set SOLR_JAVA_MEM=-Xms%SOLR_HEAP% -Xmx%SOLR_HEAP%
-IF "%SOLR_JAVA_MEM%"=="" set SOLR_JAVA_MEM=-Xms512m -Xmx512m
-IF "%SOLR_JAVA_STACK_SIZE%"=="" set SOLR_JAVA_STACK_SIZE=-Xss256k
-set SOLR_OPTS=%SOLR_JAVA_STACK_SIZE% %SOLR_OPTS%
-IF "%SOLR_TIMEZONE%"=="" set SOLR_TIMEZONE=UTC
-
-IF "%GC_TUNE%"=="" (
- set GC_TUNE=-XX:+UseG1GC ^
- -XX:+PerfDisableSharedMem ^
- -XX:+ParallelRefProcEnabled ^
- -XX:MaxGCPauseMillis=250 ^
- -XX:+UseLargePages ^
- -XX:+AlwaysPreTouch
-)
-
-if !JAVA_MAJOR_VERSION! GEQ 9 (
- IF NOT "%GC_LOG_OPTS%"=="" (
- echo ERROR: On Java 9 you cannot set GC_LOG_OPTS, only default GC logging is available. Exiting
- GOTO :eof
- )
- set GC_LOG_OPTS="-Xlog:gc*:file=\"!SOLR_LOGS_DIR!\solr_gc.log\":time,uptime:filecount=9,filesize=20M"
-) else (
- IF "%GC_LOG_OPTS%"=="" (
- rem Set defaults for Java 8
- set GC_LOG_OPTS=-verbose:gc ^
- -XX:+PrintHeapAtGC ^
- -XX:+PrintGCDetails ^
- -XX:+PrintGCDateStamps ^
- -XX:+PrintGCTimeStamps ^
- -XX:+PrintTenuringDistribution ^
- -XX:+PrintGCApplicationStoppedTime
- )
- if "%JAVA_VENDOR%" == "IBM J9" (
- set GC_LOG_OPTS=!GC_LOG_OPTS! "-Xverbosegclog:!SOLR_LOGS_DIR!\solr_gc.log" -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=9 -XX:GCLogFileSize=20M
- ) else (
- set GC_LOG_OPTS=!GC_LOG_OPTS! "-Xloggc:!SOLR_LOGS_DIR!\solr_gc.log" -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=9 -XX:GCLogFileSize=20M
- )
-)
-
-IF "%verbose%"=="1" (
- @echo Starting Solr using the following settings:
- CALL :safe_echo " JAVA = %JAVA%"
- CALL :safe_echo " SOLR_SERVER_DIR = %SOLR_SERVER_DIR%"
- CALL :safe_echo " SOLR_HOME = %SOLR_HOME%"
- @echo SOLR_HOST = %SOLR_HOST%
- @echo SOLR_PORT = %SOLR_PORT%
- @echo STOP_PORT = %STOP_PORT%
- @echo SOLR_JAVA_MEM = %SOLR_JAVA_MEM%
- @echo GC_TUNE = !GC_TUNE!
- @echo GC_LOG_OPTS = %GC_LOG_OPTS%
- @echo SOLR_TIMEZONE = %SOLR_TIMEZONE%
-
- IF "%SOLR_MODE%"=="solrcloud" (
- @echo CLOUD_MODE_OPTS = %CLOUD_MODE_OPTS%
- )
-
- IF NOT "%SOLR_OPTS%"=="" (
- @echo SOLR_OPTS = %SOLR_OPTS%
- )
-
- IF NOT "%SOLR_ADDL_ARGS%"=="" (
- CALL :safe_echo " SOLR_ADDL_ARGS = %SOLR_ADDL_ARGS%"
- )
-
- IF NOT "%SOLR_JETTY_ADDL_CONFIG%"=="" (
- CALL :safe_echo " SOLR_JETTY_ADDL_CONFIG = %SOLR_JETTY_ADDL_CONFIG%"
- )
-
- IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
- @echo RMI_PORT = !RMI_PORT!
- @echo REMOTE_JMX_OPTS = %REMOTE_JMX_OPTS%
- )
-
- IF NOT "%SOLR_LOG_LEVEL%"=="" (
- @echo SOLR_LOG_LEVEL = !SOLR_LOG_LEVEL!
- )
-
- IF NOT "%SOLR_DATA_HOME%"=="" (
- @echo SOLR_DATA_HOME = !SOLR_DATA_HOME!
- )
-
- @echo.
-)
-
-set START_OPTS=-Duser.timezone=%SOLR_TIMEZONE%
-set START_OPTS=%START_OPTS% !GC_TUNE! %GC_LOG_OPTS%
-IF NOT "!CLOUD_MODE_OPTS!"=="" set "START_OPTS=%START_OPTS% !CLOUD_MODE_OPTS!"
-IF NOT "%REMOTE_JMX_OPTS%"=="" set "START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%"
-IF NOT "%SOLR_ADDL_ARGS%"=="" set "START_OPTS=%START_OPTS% %SOLR_ADDL_ARGS%"
-IF NOT "%SOLR_HOST_ARG%"=="" set "START_OPTS=%START_OPTS% %SOLR_HOST_ARG%"
-IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"
-IF "%SOLR_SSL_ENABLED%"=="true" (
- set "SSL_PORT_PROP=-Dsolr.jetty.https.port=%SOLR_PORT%"
- set "START_OPTS=%START_OPTS% %SOLR_SSL_OPTS% !SSL_PORT_PROP!"
-)
-IF NOT "%SOLR_LOG_LEVEL%"=="" set "START_OPTS=%START_OPTS% -Dsolr.log.level=%SOLR_LOG_LEVEL%"
-
-set SOLR_LOGS_DIR_QUOTED="%SOLR_LOGS_DIR%"
-set SOLR_DATA_HOME_QUOTED="%SOLR_DATA_HOME%"
-
-set "START_OPTS=%START_OPTS% -Dsolr.log.dir=%SOLR_LOGS_DIR_QUOTED%"
-IF NOT "%SOLR_DATA_HOME%"=="" set "START_OPTS=%START_OPTS% -Dsolr.data.home=%SOLR_DATA_HOME_QUOTED%"
-IF NOT DEFINED LOG4J_CONFIG set "LOG4J_CONFIG=file:///%SOLR_SERVER_DIR%\resources\log4j2.xml"
-
-cd /d "%SOLR_SERVER_DIR%"
-
-IF NOT EXIST "%SOLR_LOGS_DIR%" (
- mkdir "%SOLR_LOGS_DIR%"
-)
-copy /Y NUL "%SOLR_LOGS_DIR%\.writable" > NUL 2>&1 && set WRITEOK=1
-IF DEFINED WRITEOK (
- del "%SOLR_LOGS_DIR%\.writable"
-) else (
- echo "ERROR: Logs directory %SOLR_LOGS_DIR% is not writable or could not be created. Exiting"
- GOTO :eof
-)
-echo " contexts etc lib modules resources scripts solr solr-webapp " > "%TEMP%\solr-pattern.txt"
-findstr /i /C:" %SOLR_LOGS_DIR% " "%TEMP%\solr-pattern.txt" 1>nul
-if %ERRORLEVEL% == 0 (
- echo "ERROR: Logs directory %SOLR_LOGS_DIR% is invalid. Reserved for the system. Exiting"
- GOTO :eof
-)
-
-IF NOT EXIST "%SOLR_LOGS_DIR%\tmp" (
- mkdir "%SOLR_LOGS_DIR%\tmp"
-)
-
-IF "%DEFAULT_CONFDIR%"=="" set "DEFAULT_CONFDIR=%SOLR_SERVER_DIR%\solr\configsets\_default\conf"
-
-IF "%FG%"=="1" (
- REM run solr in the foreground
- title "Solr-%SOLR_PORT%"
- echo %SOLR_PORT%>"%SOLR_LOGS_DIR%"\solr-%SOLR_PORT%.port
- "%JAVA%" %SERVEROPT% %SOLR_JAVA_MEM% %START_OPTS% ^
- -Dlog4j.configurationFile="%LOG4J_CONFIG%" -DSTOP.PORT=!STOP_PORT! -DSTOP.KEY=%STOP_KEY% ^
- -Dsolr.solr.home="%SOLR_HOME%" -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%" ^
- -Djetty.host=%SOLR_JETTY_HOST% -Djetty.port=%SOLR_PORT% -Djetty.home="%SOLR_SERVER_DIR%" ^
- -Djava.io.tmpdir="%SOLR_LOGS_DIR%\tmp" -jar start.jar %SOLR_JETTY_CONFIG% "%SOLR_JETTY_ADDL_CONFIG%"
-) ELSE (
- START /B "Solr-%SOLR_PORT%" /D "%SOLR_SERVER_DIR%" ^
- "%JAVA%" %SERVEROPT% %SOLR_JAVA_MEM% %START_OPTS% ^
- -Dlog4j.configurationFile="%LOG4J_CONFIG%" -DSTOP.PORT=!STOP_PORT! -DSTOP.KEY=%STOP_KEY% ^
- -Dsolr.log.muteconsole ^
- -Dsolr.solr.home="%SOLR_HOME%" -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%" ^
- -Djetty.host=%SOLR_JETTY_HOST% -Djetty.port=%SOLR_PORT% -Djetty.home="%SOLR_SERVER_DIR%" ^
- -Djava.io.tmpdir="%SOLR_LOGS_DIR%\tmp" -jar start.jar %SOLR_JETTY_CONFIG% "%SOLR_JETTY_ADDL_CONFIG%" > "!SOLR_LOGS_DIR!\solr-%SOLR_PORT%-console.log"
- echo %SOLR_PORT%>"%SOLR_LOGS_DIR%"\solr-%SOLR_PORT%.port
-
- REM now wait to see Solr come online ...
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI status -maxWaitSecs 30 -solr !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:%SOLR_PORT%/solr
-)
-
-goto done
-
-:run_example
-REM Run the requested example
-
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI run_example -script "%SDIR%\solr.cmd" -e %EXAMPLE% -d "%SOLR_SERVER_DIR%" ^
- -urlScheme !SOLR_URL_SCHEME! !PASS_TO_RUN_EXAMPLE!
-
-REM End of run_example
-goto done
-
-:get_info
-REM Find all Java processes, correlate with those listening on a port
-REM and then try to contact via that port using the status tool
-for /f "usebackq" %%i in (`dir /b "%SOLR_LOGS_DIR%" ^| findstr /i "^solr-.*\.port$"`) do (
- set SOME_SOLR_PORT=
- For /F "Delims=" %%J In ('type "%SOLR_TIP%\bin\%%i"') do set SOME_SOLR_PORT=%%~J
- if NOT "!SOME_SOLR_PORT!"=="" (
- for /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF NOT "%%k"=="0" (
- if "%%j"=="%SOLR_JETTY_HOST%:!SOME_SOLR_PORT!" (
- @echo.
- set has_info=1
- echo Found Solr process %%k running on port !SOME_SOLR_PORT!
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI status -solr !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!SOME_SOLR_PORT!/solr
- @echo.
- )
- )
- )
- )
-)
-if NOT "!has_info!"=="1" echo No running Solr nodes found.
-set has_info=
-goto done
-
-:parse_healthcheck_args
-IF [%1]==[] goto run_healthcheck
-IF "%1"=="-V" goto set_healthcheck_verbose
-IF "%1"=="-c" goto set_healthcheck_collection
-IF "%1"=="-collection" goto set_healthcheck_collection
-IF "%1"=="-z" goto set_healthcheck_zk
-IF "%1"=="-zkhost" goto set_healthcheck_zk
-IF "%1"=="-zkHost" goto set_healthcheck_zk
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-IF "%1"=="/?" goto usage
-goto run_healthcheck
-
-:set_healthcheck_verbose
-set HEALTHCHECK_VERBOSE="-verbose"
-SHIFT
-goto parse_healthcheck_args
-
-:set_healthcheck_collection
-set HEALTHCHECK_COLLECTION=%~2
-SHIFT
-SHIFT
-goto parse_healthcheck_args
-
-:set_healthcheck_zk
-set ZK_HOST=%~2
-SHIFT
-SHIFT
-goto parse_healthcheck_args
-
-:run_healthcheck
-IF NOT DEFINED HEALTHCHECK_COLLECTION goto healthcheck_usage
-IF NOT DEFINED HEALTHCHECK_VERBOSE set "HEALTHCHECK_VERBOSE="
-IF NOT DEFINED HEALTHCHECK_ZK_HOST set "HEALTHCHECK_ZK_HOST=localhost:9983"
-echo ZK_HOST: !ZK_HOST!
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI healthcheck -collection !HEALTHCHECK_COLLECTION! -zkHost !ZK_HOST! %HEALTHCHECK_VERBOSE%
-goto done
-
-:run_assert
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI %*
-if errorlevel 1 (
- exit /b 1
-)
-goto done
-
-:run_autoscaling
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI %*
-goto done
-
-:parse_config_args
-IF [%1]==[] goto run_config
-IF "%1"=="-z" goto set_config_zk
-IF "%1"=="-zkhost" goto set_config_zk
-IF "%1"=="-zkHost" goto set_config_zk
-IF "%1"=="-s" goto set_config_url_scheme
-IF "%1"=="-scheme" goto set_config_url_scheme
-set "CONFIG_ARGS=!CONFIG_ARGS! %1"
-SHIFT
-goto parse_config_args
-
-:set_config_zk
-set ZK_HOST=%~2
-SHIFT
-SHIFT
-goto parse_config_args
-
-:set_config_url_scheme
-set SOLR_URL_SCHEME=%~2
-SHIFT
-SHIFT
-goto parse_config_args
-
-:run_config
-IF NOT "!ZK_HOST!"=="" SET "CONFIG_ARGS=!CONFIG_ARGS! -z !ZK_HOST!"
-IF NOT "!SOLR_URL_SCHEME!"=="" SET "CONFIG_ARGS=!CONFIG_ARGS! -scheme !SOLR_URL_SCHEME!"
-
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI config !CONFIG_ARGS!
-if errorlevel 1 (
- exit /b 1
-)
-goto done
-
-:get_version
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI version
-goto done
-
-:run_utils
-set "TOOL_CMD=%~1"
-set q="-q"
-IF "%verbose%"=="1" set q=""
-"%JAVA%" %SOLR_SSL_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI utils -s "%DEFAULT_SERVER_DIR%" -l "%SOLR_LOGS_DIR%" %q:"=% %TOOL_CMD%
-if errorlevel 1 (
- exit /b 1
-)
-goto done
-
-:parse_create_args
-IF [%1]==[] goto run_create
-IF "%1"=="-V" goto set_create_verbose
-IF "%1"=="-c" goto set_create_name
-IF "%1"=="-core" goto set_create_name
-IF "%1"=="-collection" goto set_create_name
-IF "%1"=="-d" goto set_create_confdir
-IF "%1"=="-confdir" goto set_create_confdir
-IF "%1"=="-n" goto set_create_confname
-IF "%1"=="-confname" goto set_create_confname
-IF "%1"=="-s" goto set_create_shards
-IF "%1"=="-shards" goto set_create_shards
-IF "%1"=="-rf" goto set_create_rf
-IF "%1"=="-replicationFactor" goto set_create_rf
-IF "%1"=="-p" goto set_create_port
-IF "%1"=="-port" goto set_create_port
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-IF "%1"=="/?" goto usage
-goto run_create
-
-
-:set_create_verbose
-set CREATE_VERBOSE="-verbose"
-SHIFT
-goto parse_create_args
-
-:set_create_name
-set CREATE_NAME=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:set_create_confdir
-set CREATE_CONFDIR=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:set_create_confname
-set CREATE_CONFNAME=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:set_create_port
-set CREATE_PORT=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:set_create_shards
-set CREATE_NUM_SHARDS=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:set_create_rf
-set CREATE_REPFACT=%~2
-SHIFT
-SHIFT
-goto parse_create_args
-
-:run_create
-IF "!CREATE_NAME!"=="" (
- set "SCRIPT_ERROR=Name (-c) is a required parameter for %SCRIPT_CMD%"
- goto invalid_cmd_line
-)
-IF NOT DEFINED CREATE_VERBOSE set "CREATE_VERBOSE="
-IF "!CREATE_CONFDIR!"=="" set CREATE_CONFDIR=_default
-IF "!CREATE_NUM_SHARDS!"=="" set CREATE_NUM_SHARDS=1
-IF "!CREATE_REPFACT!"=="" set CREATE_REPFACT=1
-IF "!CREATE_CONFNAME!"=="" set CREATE_CONFNAME=!CREATE_NAME!
-
-REM Find a port that Solr is running on
-if "!CREATE_PORT!"=="" (
- for /f "usebackq" %%i in (`dir /b "%SOLR_LOGS_DIR%" ^| findstr /i "^solr-.*\.port$"`) do (
- set SOME_SOLR_PORT=
- For /F "Delims=" %%J In ('type "%SOLR_TIP%\bin\%%i"') do set SOME_SOLR_PORT=%%~J
- if NOT "!SOME_SOLR_PORT!"=="" (
- for /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF NOT "%%k"=="0" set CREATE_PORT=!SOME_SOLR_PORT!
- )
- )
- )
-)
-if "!CREATE_PORT!"=="" (
- set "SCRIPT_ERROR=Could not find a running Solr instance on this host! Please use the -p option to specify the port."
- goto err
-)
-
-if "!CREATE_CONFDIR!"=="_default" (
- echo WARNING: Using _default configset with data driven schema functionality. NOT RECOMMENDED for production use.
- echo To turn off: bin\solr config -c !CREATE_NAME! -p !CREATE_PORT! -action set-user-property -property update.autoCreateFields -value false
-)
-
-if "%SCRIPT_CMD%"=="create_core" (
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI create_core -name !CREATE_NAME! -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!CREATE_PORT!/solr ^
- -confdir !CREATE_CONFDIR! -configsetsDir "%SOLR_TIP%\server\solr\configsets" %CREATE_VERBOSE%
-) else (
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" -Dsolr.default.confdir="%DEFAULT_CONFDIR%"^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI create -name !CREATE_NAME! -shards !CREATE_NUM_SHARDS! -replicationFactor !CREATE_REPFACT! ^
- -confname !CREATE_CONFNAME! -confdir !CREATE_CONFDIR! -configsetsDir "%SOLR_TIP%\server\solr\configsets" ^
- -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!CREATE_PORT!/solr %CREATE_VERBOSE%
-)
-
-goto done
-
-:parse_delete_args
-IF [%1]==[] goto run_delete
-IF "%1"=="-V" goto set_delete_verbose
-IF "%1"=="-c" goto set_delete_name
-IF "%1"=="-core" goto set_delete_name
-IF "%1"=="-collection" goto set_delete_name
-IF "%1"=="-p" goto set_delete_port
-IF "%1"=="-port" goto set_delete_port
-IF "%1"=="-deleteConfig" goto set_delete_config
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-IF "%1"=="/?" goto usage
-goto run_delete
-
-:set_delete_verbose
-set DELETE_VERBOSE="-verbose"
-SHIFT
-goto parse_delete_args
-
-:set_delete_name
-set DELETE_NAME=%~2
-SHIFT
-SHIFT
-goto parse_delete_args
-
-:set_delete_port
-set DELETE_PORT=%~2
-SHIFT
-SHIFT
-goto parse_delete_args
-
-:set_delete_config
-set DELETE_CONFIG=%~2
-SHIFT
-SHIFT
-goto parse_delete_args
-
-:run_delete
-IF NOT DEFINED DELETE_VERBOSE set "DELETE_VERBOSE="
-IF "!DELETE_NAME!"=="" (
- set "SCRIPT_ERROR=Name (-c) is a required parameter for %SCRIPT_CMD%"
- goto invalid_cmd_line
-)
-
-REM Find a port that Solr is running on
-if "!DELETE_PORT!"=="" (
- for /f "usebackq" %%i in (`dir /b "%SOLR_LOGS_DIR%" ^| findstr /i "^solr-.*\.port$"`) do (
- set SOME_SOLR_PORT=
- For /F "Delims=" %%J In ('type "%SOLR_TIP%\bin\%%i"') do set SOME_SOLR_PORT=%%~J
- if NOT "!SOME_SOLR_PORT!"=="" (
- for /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF NOT "%%k"=="0" set DELETE_PORT=!SOME_SOLR_PORT!
- )
- )
- )
-)
-if "!DELETE_PORT!"=="" (
- set "SCRIPT_ERROR=Could not find a running Solr instance on this host! Please use the -p option to specify the port."
- goto err
-)
-
-if "!DELETE_CONFIG!"=="" (
- set DELETE_CONFIG=true
-)
-
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
--Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
--classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
-org.apache.solr.util.SolrCLI delete -name !DELETE_NAME! -deleteConfig !DELETE_CONFIG! ^
--solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!DELETE_PORT!/solr %DELETE_VERBOSE%
-
-goto done
-
-REM Clumsy to do the state machine thing for -d and -n, but that's required for back-compat
-:parse_zk_args
-IF "%1"=="-upconfig" (
- goto set_zk_op
-) ELSE IF "%1"=="-V" (
- goto set_zk_verbose
-) ELSE IF "%1"=="upconfig" (
- goto set_zk_op
-) ELSE IF "%1"=="-downconfig" (
- goto set_zk_op
-) ELSE IF "%1"=="downconfig" (
- goto set_zk_op
-) ELSE IF "%1"=="cp" (
- goto set_zk_op
-) ELSE IF "%1"=="mv" (
- goto set_zk_op
-) ELSE IF "%1"=="rm" (
- goto set_zk_op
-) ELSE IF "%1"=="ls" (
- goto set_zk_op
-) ELSE IF "%1"=="mkroot" (
- goto set_zk_op
-) ELSE IF "%1"=="-n" (
- goto set_config_name
-) ELSE IF "%1"=="-r" (
- goto set_zk_recurse
-) ELSE IF "%1"=="-configname" (
- goto set_config_name
-) ELSE IF "%1"=="-d" (
- goto set_configdir
-) ELSE IF "%1"=="-confdir" (
- goto set_configdir
-) ELSE IF "%1"=="-z" (
- goto set_config_zk
-) ELSE IF "%1"=="/?" (
- goto zk_usage
-) ELSE IF "%1"=="-h" (
- goto zk_usage
-) ELSE IF "%1"=="-help" (
- goto zk_usage
-) ELSE IF "!ZK_SRC!"=="" (
- if not "%~1"=="" (
- goto set_zk_src
- )
-) ELSE IF "!ZK_DST!"=="" (
- IF "%ZK_OP%"=="cp" (
- goto set_zk_dst
- )
- IF "%ZK_OP%"=="mv" (
- goto set_zk_dst
- )
- set ZK_DST="_"
-) ELSE IF NOT "%1"=="" (
- set ERROR_MSG="Unrecognized or misplaced zk argument %1%"
- goto zk_short_usage
-)
-goto run_zk
-
-:set_zk_op
-set ZK_OP=%~1
-SHIFT
-goto parse_zk_args
-
-:set_zk_verbose
-set ZK_VERBOSE="-verbose"
-SHIFT
-goto parse_zk_args
-
-:set_config_name
-set CONFIGSET_NAME=%~2
-SHIFT
-SHIFT
-goto parse_zk_args
-
-:set_configdir
-set CONFIGSET_DIR=%~2
-SHIFT
-SHIFT
-goto parse_zk_args
-
-:set_config_zk
-set ZK_HOST=%~2
-SHIFT
-SHIFT
-goto parse_zk_args
-
-:set_zk_src
-set ZK_SRC=%~1
-SHIFT
-goto parse_zk_args
-
-:set_zk_dst
-set ZK_DST=%~1
-SHIFT
-goto parse_zk_args
-
-:set_zk_recurse
-set ZK_RECURSE="true"
-SHIFT
-goto parse_zk_args
-
-:run_zk
-IF "!ZK_OP!"=="" (
- set "ERROR_MSG=Invalid command specified for zk sub-command"
- goto zk_short_usage
-)
-
-IF "!ZK_HOST!"=="" (
- set "ERROR_MSG=Must specify -z zkHost"
- goto zk_short_usage
-)
-
-IF "!ZK_OP!"=="-upconfig" (
- set ZK_OP="upconfig"
-)
-IF "!ZK_OP!"=="-downconfig" (
- set ZK_OP="downconfig"
-)
-
-IF "!ZK_OP!"=="upconfig" (
- IF "!CONFIGSET_NAME!"=="" (
- set ERROR_MSG="-n option must be set for upconfig"
- goto zk_short_usage
- )
- IF "!CONFIGSET_DIR!"=="" (
- set ERROR_MSG="The -d option must be set for upconfig."
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%^
- -configsetsDir "%SOLR_TIP%/server/solr/configsets"
-) ELSE IF "!ZK_OP!"=="downconfig" (
- IF "!CONFIGSET_NAME!"=="" (
- set ERROR_MSG="-n option must be set for downconfig"
- goto zk_short_usage
- )
- IF "!CONFIGSET_DIR!"=="" (
- set ERROR_MSG="The -d option must be set for downconfig."
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -confname !CONFIGSET_NAME! -confdir !CONFIGSET_DIR! -zkHost !ZK_HOST! %ZK_VERBOSE%
-) ELSE IF "!ZK_OP!"=="cp" (
- IF "%ZK_SRC%"=="" (
- set ERROR_MSG="<src> must be specified for 'cp' command"
- goto zk_short_usage
- )
- IF "%ZK_DST%"=="" (
- set ERROR_MSG=<dest> must be specified for 'cp' command"
- goto zk_short_usage
- )
- IF NOT "!ZK_SRC:~0,3!"=="zk:" (
- IF NOT "!%ZK_DST:~0,3!"=="zk:" (
- set ERROR_MSG="At least one of src or dst must be prefixed by 'zk:'"
- goto zk_short_usage
- )
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! -recurse !ZK_RECURSE! %ZK_VERBOSE%
-) ELSE IF "!ZK_OP!"=="mv" (
- IF "%ZK_SRC%"=="" (
- set ERROR_MSG="<src> must be specified for 'mv' command"
- goto zk_short_usage
- )
- IF "%ZK_DST%"=="" (
- set ERROR_MSG="<dest> must be specified for 'mv' command"
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -src !ZK_SRC! -dst !ZK_DST! %ZK_VERBOSE%
-) ELSE IF "!ZK_OP!"=="rm" (
- IF "%ZK_SRC"=="" (
- set ERROR_MSG="Zookeeper path to remove must be specified when using the 'rm' command"
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
-) ELSE IF "!ZK_OP!"=="ls" (
- IF "%ZK_SRC"=="" (
- set ERROR_MSG="Zookeeper path to remove must be specified when using the 'ls' command"
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! -recurse !ZK_RECURSE! %ZK_VERBOSE%
-) ELSE IF "!ZK_OP!"=="mkroot" (
- IF "%ZK_SRC"=="" (
- set ERROR_MSG="Zookeeper path to create must be specified when using the 'mkroot' command"
- goto zk_short_usage
- )
- "%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%SOLR_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI !ZK_OP! -zkHost !ZK_HOST! -path !ZK_SRC! %ZK_VERBOSE%
-) ELSE (
- set ERROR_MSG="Unknown zk option !ZK_OP!"
- goto zk_short_usage
-)
-goto done
-
-
-:run_auth
-IF "%1"=="-help" goto usage
-IF "%1"=="-usage" goto usage
-
-REM Options parsing.
-REM Note: With the following technique of parsing, it is not possible
-REM to have an option without a value.
-set "AUTH_PARAMS=%1"
-set "option="
-for %%a in (%*) do (
- if not defined option (
- set arg=%%a
- if "!arg:~0,1!" equ "-" set "option=!arg!"
- ) else (
- set "option!option!=%%a"
- if "!option!" equ "-d" set "SOLR_SERVER_DIR=%%a"
- if "!option!" equ "-s" set "SOLR_HOME=%%a"
- if not "!option!" equ "-s" if not "!option!" equ "-d" (
- set "AUTH_PARAMS=!AUTH_PARAMS! !option! %%a"
- )
- set "option="
- )
-)
-IF "%SOLR_SERVER_DIR%"=="" set "SOLR_SERVER_DIR=%DEFAULT_SERVER_DIR%"
-IF NOT EXIST "%SOLR_SERVER_DIR%" (
- set "SCRIPT_ERROR=Solr server directory %SOLR_SERVER_DIR% not found!"
- goto err
-)
-IF "%SOLR_HOME%"=="" set "SOLR_HOME=%SOLR_SERVER_DIR%\solr"
-IF EXIST "%cd%\%SOLR_HOME%" set "SOLR_HOME=%cd%\%SOLR_HOME%"
-IF NOT EXIST "%SOLR_HOME%\" (
- IF EXIST "%SOLR_SERVER_DIR%\%SOLR_HOME%" (
- set "SOLR_HOME=%SOLR_SERVER_DIR%\%SOLR_HOME%"
- ) ELSE (
- set "SCRIPT_ERROR=Solr home directory %SOLR_HOME% not found!"
- goto err
- )
-)
-
-if "!AUTH_PORT!"=="" (
- for /f "usebackq" %%i in (`dir /b "%SOLR_TIP%\bin" ^| findstr /i "^solr-.*\.port$"`) do (
- set SOME_SOLR_PORT=
- For /F "Delims=" %%J In ('type "%SOLR_TIP%\bin\%%i"') do set SOME_SOLR_PORT=%%~J
- if NOT "!SOME_SOLR_PORT!"=="" (
- for /f "tokens=2,5" %%j in ('netstat -aon ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF NOT "%%k"=="0" set AUTH_PORT=!SOME_SOLR_PORT!
- )
- )
- )
-)
-"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
- -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
- -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
- org.apache.solr.util.SolrCLI auth %AUTH_PARAMS% -solrIncludeFile "%SOLR_INCLUDE%" -authConfDir "%SOLR_HOME%" ^
- -solrUrl !SOLR_URL_SCHEME!://%SOLR_TOOL_HOST%:!AUTH_PORT!/solr
-goto done
-
-
-:invalid_cmd_line
-@echo.
-IF "!SCRIPT_ERROR!"=="" (
- @echo Invalid command-line option: %1
-) ELSE (
- @echo ERROR: !SCRIPT_ERROR!
-)
-@echo.
-IF "%FIRST_ARG%"=="start" (
- goto start_usage
-) ELSE IF "%FIRST_ARG:~0,1%" == "-" (
- goto start_usage
-) ELSE IF "%FIRST_ARG%"=="restart" (
- goto start_usage
-) ELSE IF "%FIRST_ARG%"=="stop" (
- goto stop_usage
-) ELSE IF "%FIRST_ARG%"=="healthcheck" (
- goto healthcheck_usage
-) ELSE IF "%FIRST_ARG%"=="create" (
- goto create_usage
-) ELSE IF "%FIRST_ARG%"=="create_core" (
- goto create_core_usage
-) ELSE IF "%FIRST_ARG%"=="create_collection" (
- goto create_collection_usage
-) ELSE IF "%FIRST_ARG%"=="zk" (
- goto zk_short_usage
-) ELSE IF "%FIRST_ARG%"=="auth" (
- goto auth_usage
-) ELSE IF "%FIRST_ARG%"=="status" (
- goto status_usage
-) ELSE (
- goto script_usage
-)
-
-:need_java_home
-@echo Please set the JAVA_HOME environment variable to the path where you installed Java 1.8+
-goto done
-
-:need_java_vers
-@echo Java 1.8 or later is required to run Solr.
-goto done
-
-:err
-@echo.
-@echo ERROR: !SCRIPT_ERROR!
-@echo.
-exit /b 1
-
-:done
-ENDLOCAL
-exit /b 0
-
-REM Tests what Java we have and sets some global variables
-:resolve_java_info
-
-CALL :resolve_java_vendor
-
-set JAVA_MAJOR_VERSION=0
-set JAVA_VERSION_INFO=
-set JAVA_BUILD=0
-
-FOR /f "usebackq tokens=3" %%a IN (`^""%JAVA%" -version 2^>^&1 ^| findstr "version"^"`) do (
- set JAVA_VERSION_INFO=%%a
- REM Remove surrounding quotes
- set JAVA_VERSION_INFO=!JAVA_VERSION_INFO:"=!
-
- REM Extract the major Java version, e.g. 7, 8, 9, 10 ...
- for /f "tokens=1,2 delims=._-" %%a in ("!JAVA_VERSION_INFO!") do (
- if %%a GEQ 9 (
- set JAVA_MAJOR_VERSION=%%a
- ) else (
- set JAVA_MAJOR_VERSION=%%b
- )
- )
-
- REM Don't look for "_{build}" if we're on IBM J9.
- if NOT "%JAVA_VENDOR%" == "IBM J9" (
- for /f "delims=_ tokens=2" %%a in ("!JAVA_VERSION_INFO!") do (
- set /a JAVA_BUILD=%%a
- )
- )
-)
-GOTO :eof
-
-REM Set which JVM vendor we have
-:resolve_java_vendor
-"%JAVA%" -version 2>&1 | findstr /i "IBM J9" > nul
-if %ERRORLEVEL% == 1 ( set "JAVA_VENDOR=Oracle" ) else ( set "JAVA_VENDOR=IBM J9" )
-
-set JAVA_VENDOR_OUT=
-GOTO :eof
-
-REM Safe echo which does not mess with () in strings
-:safe_echo
-set "eout=%1"
-set eout=%eout:"=%
-echo !eout!
-GOTO :eof
diff --git a/KeywordSearch/solr/bin/autopsy-solr.in.cmd b/KeywordSearch/solr/bin/autopsy-solr.in.cmd
deleted file mode 100755
index 295059b83a0b6f128ac0271ba441875581aababe..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/bin/autopsy-solr.in.cmd
+++ /dev/null
@@ -1,173 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-@REM @echo off
-
-REM Settings here will override settings in existing env vars or in bin/solr. The default shipped state
-REM of this file is completely commented.
-
-REM By default the script will use JAVA_HOME to determine which java
-REM to use, but you can set a specific path for Solr to use without
-REM affecting other Java applications on your server/workstation.
-REM set SOLR_JAVA_HOME=
-
-REM Increase Java Min/Max Heap as needed to support your indexing / query needs
-REM set SOLR_JAVA_MEM=-Xms512m -Xmx512m
-
-REM Configure verbose GC logging:
-REM For Java 8: if this is set, additional params will be added to specify the log file & rotation
-REM For Java 9 or higher: GC_LOG_OPTS is currently not supported. If you set it, the startup script will exit with failure.
-REM set GC_LOG_OPTS=-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime
-
-REM Various GC settings have shown to work well for a number of common Solr workloads.
-REM See solr.cmd GC_TUNE for the default list.
-REM set GC_TUNE=-XX:SurvivorRatio=4
-REM set GC_TUNE=%GC_TUNE% -XX:TargetSurvivorRatio=90
-REM set GC_TUNE=%GC_TUNE% -XX:MaxTenuringThreshold=8
-REM set GC_TUNE=%GC_TUNE% -XX:+UseConcMarkSweepGC
-REM set GC_TUNE=%GC_TUNE% -XX:ConcGCThreads=4
-REM set GC_TUNE=%GC_TUNE% -XX:ParallelGCThreads=4
-REM set GC_TUNE=%GC_TUNE% -XX:+CMSScavengeBeforeRemark
-REM set GC_TUNE=%GC_TUNE% -XX:PretenureSizeThreshold=64m
-REM set GC_TUNE=%GC_TUNE% -XX:+UseCMSInitiatingOccupancyOnly
-REM set GC_TUNE=%GC_TUNE% -XX:CMSInitiatingOccupancyFraction=50
-REM set GC_TUNE=%GC_TUNE% -XX:CMSMaxAbortablePrecleanTime=6000
-REM set GC_TUNE=%GC_TUNE% -XX:+CMSParallelRemarkEnabled
-REM set GC_TUNE=%GC_TUNE% -XX:+ParallelRefProcEnabled
-REM set GC_TUNE=%GC_TUNE% -XX:-OmitStackTraceInFastThrow etc.
-
-REM Set the ZooKeeper connection string if using an external ZooKeeper ensemble
-REM e.g. host1:2181,host2:2181/chroot
-REM Leave empty if not using SolrCloud
-REM set ZK_HOST=
-
-REM Set the ZooKeeper client timeout (for SolrCloud mode)
-REM set ZK_CLIENT_TIMEOUT=15000
-
-REM By default the start script uses "localhost"; override the hostname here
-REM for production SolrCloud environments to control the hostname exposed to cluster state
-REM set SOLR_HOST=192.168.1.1
-
-REM By default Solr will try to connect to Zookeeper with 30 seconds in timeout; override the timeout if needed
-REM set SOLR_WAIT_FOR_ZK=30
-
-REM By default the start script uses UTC; override the timezone if needed
-REM set SOLR_TIMEZONE=UTC
-
-REM Set to true to activate the JMX RMI connector to allow remote JMX client applications
-REM to monitor the JVM hosting Solr; set to "false" to disable that behavior
-REM (false is recommended in production environments)
-REM set ENABLE_REMOTE_JMX_OPTS=false
-
-REM The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here
-REM set RMI_PORT=18983
-
-REM Anything you add to the SOLR_OPTS variable will be included in the java
-REM start command line as-is, in ADDITION to other options. If you specify the
-REM -a option on start script, those options will be appended as well. Examples:
-set SOLR_OPTS=%SOLR_OPTS% -Dbootstrap_confdir=../solr/configsets/AutopsyConfig/conf -Dcollection.configName=AutopsyConfig -Dsolr.default.confdir=../solr/configsets/AutopsyConfig/conf
-
-REM Path to a directory for Solr to store cores and their data. By default, Solr will use server\solr
-REM If solr.xml is not stored in ZooKeeper, this directory needs to contain solr.xml
-REM set SOLR_HOME=
-
-REM Path to a directory that Solr will use as root for data folders for each core.
-REM If not set, defaults to <instance_dir>/data. Overridable per core through 'dataDir' core property
-REM set SOLR_DATA_HOME=
-
-REM Changes the logging level. Valid values: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF. Default is INFO
-REM This is an alternative to changing the rootLogger in log4j2.xml
-REM set SOLR_LOG_LEVEL=INFO
-
-REM Location where Solr should write logs to. Absolute or relative to solr start dir
-REM set SOLR_LOGS_DIR=logs
-
-REM Enables log rotation before starting Solr. Setting SOLR_LOG_PRESTART_ROTATION=true will let Solr take care of pre
-REM start rotation of logs. This is false by default as log4j2 handles this for us. If you choose to use another log
-REM framework that cannot do startup rotation, you may want to enable this to let Solr rotate logs on startup.
-REM set SOLR_LOG_PRESTART_ROTATION=false
-
-REM Set the host interface to listen on. Jetty will listen on all interfaces (0.0.0.0) by default.
-REM This must be an IPv4 ("a.b.c.d") or bracketed IPv6 ("[x::y]") address, not a hostname!
-REM set SOLR_JETTY_HOST=0.0.0.0
-
-REM Sets the port Solr binds to, default is 8983
-REM set SOLR_PORT=8983
-
-REM Enables HTTPS. It is implictly true if you set SOLR_SSL_KEY_STORE. Use this config
-REM to enable https module with custom jetty configuration.
-REM set SOLR_SSL_ENABLED=true
-REM Uncomment to set SSL-related system properties
-REM Be sure to update the paths to the correct keystore for your environment
-REM set SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks
-REM set SOLR_SSL_KEY_STORE_PASSWORD=secret
-REM set SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks
-REM set SOLR_SSL_TRUST_STORE_PASSWORD=secret
-REM Require clients to authenticate
-REM set SOLR_SSL_NEED_CLIENT_AUTH=false
-REM Enable clients to authenticate (but not require)
-REM set SOLR_SSL_WANT_CLIENT_AUTH=false
-REM SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
-REM this to false can be useful to disable these checks when re-using a certificate on many hosts
-REM set SOLR_SSL_CHECK_PEER_NAME=true
-REM Override Key/Trust Store types if necessary
-REM set SOLR_SSL_KEY_STORE_TYPE=JKS
-REM set SOLR_SSL_TRUST_STORE_TYPE=JKS
-
-REM Uncomment if you want to override previously defined SSL values for HTTP client
-REM otherwise keep them commented and the above values will automatically be set for HTTP clients
-REM set SOLR_SSL_CLIENT_KEY_STORE=
-REM set SOLR_SSL_CLIENT_KEY_STORE_PASSWORD=
-REM set SOLR_SSL_CLIENT_TRUST_STORE=
-REM set SOLR_SSL_CLIENT_TRUST_STORE_PASSWORD=
-REM set SOLR_SSL_CLIENT_KEY_STORE_TYPE=
-REM set SOLR_SSL_CLIENT_TRUST_STORE_TYPE=
-
-REM Sets path of Hadoop credential provider (hadoop.security.credential.provider.path property) and
-REM enables usage of credential store.
-REM Credential provider should store the following keys:
-REM * solr.jetty.keystore.password
-REM * solr.jetty.truststore.password
-REM Set the two below if you want to set specific store passwords for HTTP client
-REM * javax.net.ssl.keyStorePassword
-REM * javax.net.ssl.trustStorePassword
-REM More info: https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CredentialProviderAPI.html
-REM set SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH=localjceks://file/home/solr/hadoop-credential-provider.jceks
-REM set SOLR_OPTS=" -Dsolr.ssl.credential.provider.chain=hadoop"
-
-REM Settings for authentication
-REM Please configure only one of SOLR_AUTHENTICATION_CLIENT_BUILDER or SOLR_AUTH_TYPE parameters
-REM set SOLR_AUTHENTICATION_CLIENT_BUILDER=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory
-REM set SOLR_AUTH_TYPE=basic
-REM set SOLR_AUTHENTICATION_OPTS="-Dbasicauth=solr:SolrRocks"
-
-REM Settings for ZK ACL
-REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^
-REM -DzkCredentialsProvider=org.apache.solr.common.cloud.VMParamsSingleSetCredentialsDigestZkCredentialsProvider ^
-REM -DzkDigestUsername=admin-user -DzkDigestPassword=CHANGEME-ADMIN-PASSWORD ^
-REM -DzkDigestReadonlyUsername=readonly-user -DzkDigestReadonlyPassword=CHANGEME-READONLY-PASSWORD
-REM set SOLR_OPTS=%SOLR_OPTS% %SOLR_ZK_CREDS_AND_ACLS%
-
-REM When running Solr in non-cloud mode and if planning to do distributed search (using the "shards" parameter), the
-REM list of hosts needs to be whitelisted or Solr will forbid the request. The whitelist can be configured in solr.xml,
-REM or if you are using the OOTB solr.xml, can be specified using the system property "solr.shardsWhitelist". Alternatively
-REM host checking can be disabled by using the system property "solr.disable.shardsWhitelist"
-REM set SOLR_OPTS="%SOLR_OPTS% -Dsolr.shardsWhitelist=http://localhost:8983,http://localhost:8984"
-
-REM For a visual indication in the Admin UI of what type of environment this cluster is, configure
-REM a -Dsolr.environment property below. Valid values are prod, stage, test, dev, with an optional
-REM label or color, e.g. -Dsolr.environment=test,label=Functional+test,color=brown
-REM SOLR_OPTS="$SOLR_OPTS -Dsolr.environment=prod"
diff --git a/KeywordSearch/solr/bin/postlogs b/KeywordSearch/solr/bin/postlogs
new file mode 100755
index 0000000000000000000000000000000000000000..8925dd63464bd5d8ab5683753822574d53fa160a
--- /dev/null
+++ b/KeywordSearch/solr/bin/postlogs
@@ -0,0 +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.
+
+############################################################################################
+#
+# A command line tool for indexing Solr logs in the out-of-the-box log format.
+#
+# First build the Solr distribution. Then run postlogs from inside the Solr distribution
+# home directory as described below:
+#
+# parameters:
+#
+# -- baseUrl: Example http://localhost:8983/solr/collection1
+# -- rootDir: All files found at or below the root will be indexed
+#
+# Sample syntax: ./bin/postlogs http://localhost:8983/solr/collection1 /user/foo/logs");
+#
+#
+############################################################################################
+
+java -classpath dist/*:dist/solrj-lib/*: org.apache.solr.util.SolrLogPostTool $1 $2
diff --git a/KeywordSearch/solr/bin/solr b/KeywordSearch/solr/bin/solr
index 81e98a52695ff4112fb59bc7a75ba6cb062b75a8..e178bcd17dd7cfeea2c79fa124101edbdb6e9b29 100755
--- a/KeywordSearch/solr/bin/solr
+++ b/KeywordSearch/solr/bin/solr
@@ -102,10 +102,17 @@ fi
if [ -n "$SOLR_JAVA_HOME" ]; then
JAVA="$SOLR_JAVA_HOME/bin/java"
+ JSTACK="$SOLR_JAVA_HOME/bin/jstack"
elif [ -n "$JAVA_HOME" ]; then
- for java in "$JAVA_HOME"/bin/amd64/java "$JAVA_HOME"/bin/java; do
- if [ -x "$java" ]; then
- JAVA="$java"
+ for java in "$JAVA_HOME"/bin/amd64 "$JAVA_HOME"/bin; do
+ if [ -x "$java/java" ]; then
+ JAVA="$java/java"
+ if [ -x "$java/jstack" ]; then
+ JSTACK="$java/jstack"
+ else
+ echo >&2 "The currently defined JAVA_HOME ($JAVA_HOME) refers to a location"
+ echo >&2 "where java was found but jstack was not found. Continuing."
+ fi
break
fi
done
@@ -118,6 +125,7 @@ elif [ -n "$JAVA_HOME" ]; then
fi
else
JAVA=java
+ JSTACK=jstack
fi
if [ -z "$SOLR_STOP_WAIT" ]; then
@@ -206,6 +214,10 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; then
SOLR_SSL_OPTS+=" -Dsolr.jetty.truststore.type=$SOLR_SSL_TRUST_STORE_TYPE"
fi
+ if [ -z "$SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION" ] ; then
+ SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"
+ fi
+
if [ -n "$SOLR_SSL_NEED_CLIENT_AUTH" ]; then
SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.needClientAuth=$SOLR_SSL_NEED_CLIENT_AUTH"
fi
@@ -257,6 +269,11 @@ else
SOLR_JETTY_CONFIG+=("--module=http")
fi
+# Requestlog options
+if [ "$SOLR_REQUESTLOG_ENABLED" == "true" ]; then
+ SOLR_JETTY_CONFIG+=("--module=requestlog")
+fi
+
# Authentication options
if [ -z "$SOLR_AUTH_TYPE" ] && [ -n "$SOLR_AUTHENTICATION_OPTS" ]; then
echo "WARNING: SOLR_AUTHENTICATION_OPTS environment variable configured without associated SOLR_AUTH_TYPE variable"
@@ -312,7 +329,7 @@ function print_usage() {
if [ -z "$CMD" ]; then
echo ""
echo "Usage: solr COMMAND OPTIONS"
- echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling"
+ echo " where COMMAND is one of: start, stop, restart, status, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling, export"
echo ""
echo " Standalone server example (start Solr running in the background on port 8984):"
echo ""
@@ -705,7 +722,7 @@ function jetty_port() {
function run_tool() {
"$JAVA" $SOLR_SSL_OPTS $AUTHC_OPTS $SOLR_ZK_CREDS_AND_ACLS -Dsolr.install.dir="$SOLR_TIP" \
- -Dlog4j.configurationFile="file:$DEFAULT_SERVER_DIR/resources/log4j2-console.xml" \
+ -Dlog4j.configurationFile="$DEFAULT_SERVER_DIR/resources/log4j2-console.xml" \
-classpath "$DEFAULT_SERVER_DIR/solr-webapp/webapp/WEB-INF/lib/*:$DEFAULT_SERVER_DIR/lib/ext/*:$DEFAULT_SERVER_DIR/lib/*" \
org.apache.solr.util.SolrCLI "$@"
@@ -759,8 +776,59 @@ function get_info() {
return $CODE
} # end get_info
+function run_package() {
+ runningSolrUrl=""
+
+ numSolrs=`find "$SOLR_PID_DIR" -name "solr-*.pid" -type f | wc -l | tr -d ' '`
+ if [ "$numSolrs" != "0" ]; then
+ #echo -e "\nFound $numSolrs Solr nodes: "
+ while read PIDF
+ do
+ ID=`cat "$PIDF"`
+ port=`jetty_port "$ID"`
+ if [ "$port" != "" ]; then
+ #echo -e "\nSolr process $ID running on port $port"
+ runningSolrUrl="$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$port/solr"
+ break
+ CODE=$?
+ echo ""
+ else
+ echo -e "\nSolr process $ID from $PIDF not found."
+ CODE=1
+ fi
+ done < <(find "$SOLR_PID_DIR" -name "solr-*.pid" -type f)
+ else
+ # no pid files but check using ps just to be sure
+ numSolrs=`ps auxww | grep start\.jar | grep solr\.solr\.home | grep -v grep | wc -l | sed -e 's/^[ \t]*//'`
+ if [ "$numSolrs" != "0" ]; then
+ echo -e "\nFound $numSolrs Solr nodes: "
+ PROCESSES=$(ps auxww | grep start\.jar | grep solr\.solr\.home | grep -v grep | awk '{print $2}' | sort -r)
+ for ID in $PROCESSES
+ do
+ port=`jetty_port "$ID"`
+ if [ "$port" != "" ]; then
+ echo ""
+ echo "Solr process $ID running on port $port"
+ runningSolrUrl="$SOLR_URL_SCHEME://$SOLR_TOOL_HOST:$port/solr"
+ break
+ CODE=$?
+ echo ""
+ fi
+ done
+ else
+ echo -e "\nNo Solr nodes are running.\n"
+ exit 1
+ CODE=3
+ fi
+ fi
+
+ run_tool package -solrUrl "$runningSolrUrl" $@
+ #exit $?
+}
+
# tries to gracefully stop Solr using the Jetty
# stop command and if that fails, then uses kill -9
+# (will attempt to jstack before killing)
function stop_solr() {
DIR="$1"
@@ -797,11 +865,15 @@ function stop_solr() {
CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $SOLR_PID | sort -r | tr -d ' '`
if [ "$CHECK_PID" != "" ]; then
+ if [ "$JSTACK" != "" ]; then
+ echo -e "Solr process $SOLR_PID is still running; jstacking it now."
+ $JSTACK $SOLR_PID
+ fi
echo -e "Solr process $SOLR_PID is still running; forcefully killing it now."
kill -9 $SOLR_PID
echo "Killed process $SOLR_PID"
rm -f "$SOLR_PID_DIR/solr-$SOLR_PORT.pid"
- sleep 1
+ sleep 10
fi
CHECK_PID=`ps auxww | awk '{print $2}' | grep -w $SOLR_PID | sort -r | tr -d ' '`
@@ -1086,7 +1158,7 @@ if [[ "$SCRIPT_CMD" == "create" || "$SCRIPT_CMD" == "create_core" || "$SCRIPT_CM
echo " To turn off: bin/solr config -c $CREATE_NAME -p $CREATE_PORT -action set-user-property -property update.autoCreateFields -value false"
fi
- if [[ "$(whoami)" == "root" ]] && [[ "$FORCE" == "false" ]] ; then
+ if [[ $EUID -eq 0 ]] && [[ "$FORCE" == "false" ]] ; then
echo "WARNING: Creating cores as the root user can cause Solr to fail and is not advisable. Exiting."
echo " If you started Solr as root (not advisable either), force core creation by adding argument -force"
exit 1
@@ -1349,6 +1421,16 @@ if [[ "$SCRIPT_CMD" == "autoscaling" ]]; then
exit $?
fi
+if [[ "$SCRIPT_CMD" == "export" ]]; then
+ run_tool export $@
+ exit $?
+fi
+
+if [[ "$SCRIPT_CMD" == "package" ]]; then
+ run_package $@
+ exit $?
+fi
+
if [[ "$SCRIPT_CMD" == "auth" ]]; then
VERBOSE=""
@@ -1511,6 +1593,8 @@ if [ -z "$SOLR_ULIMIT_CHECKS" ] || [ "$SOLR_ULIMIT_CHECKS" != "false" ]; then
if hash ulimit 2>/dev/null; then
openFiles=$(ulimit -n)
maxProcs=$(ulimit -u)
+ virtualMemory=$(ulimit -v)
+ maxMemory=$(ulimit -m)
if [ $openFiles != "unlimited" ] && [ $openFiles -lt "$SOLR_RECOMMENDED_OPEN_FILES" ]; then
echo "*** [WARN] *** Your open file limit is currently $openFiles. "
echo " It should be set to $SOLR_RECOMMENDED_OPEN_FILES to avoid operational disruption. "
@@ -1522,10 +1606,23 @@ if [ -z "$SOLR_ULIMIT_CHECKS" ] || [ "$SOLR_ULIMIT_CHECKS" != "false" ]; then
echo " It should be set to $SOLR_RECOMMENDED_MAX_PROCESSES to avoid operational disruption. "
echo " If you no longer wish to see this warning, set SOLR_ULIMIT_CHECKS to false in your profile or solr.in.sh"
fi
+ if [ $virtualMemory != "unlimited" ]; then
+ echo "*** [WARN] *** Your Virtual Memory limit is $virtualMemory. "
+ echo " It should be set to 'unlimited' to avoid operational disruption. "
+ echo " If you no longer wish to see this warning, set SOLR_ULIMIT_CHECKS to false in your profile or solr.in.sh"
+ fi
+ if [ $maxMemory != "unlimited" ]; then
+ echo "*** [WARN] *** Your Max Memory Size limit is $maxMemory. "
+ echo " It should be set to 'unlimited' to avoid operational disruption. "
+ echo " If you no longer wish to see this warning, set SOLR_ULIMIT_CHECKS to false in your profile or solr.in.sh"
+ fi
+
else
echo "Could not check ulimits for processes and open files, recommended values are"
- echo " max processes: $SOLR_RECOMMENDED_MAX_PROCESSES "
- echo " open files: $SOLR_RECOMMENDED_OPEN_FILES"
+ echo " max processes: $SOLR_RECOMMENDED_MAX_PROCESSES "
+ echo " open files: $SOLR_RECOMMENDED_OPEN_FILES"
+ echo " virtual memory: unlimited"
+ echo " max memorh size: unlimited"
fi
fi
fi
@@ -1657,10 +1754,12 @@ if [ $# -gt 0 ]; then
;;
-v)
SOLR_LOG_LEVEL=DEBUG
+ PASS_TO_RUN_EXAMPLE+=" -Dsolr.log.level=$SOLR_LOG_LEVEL"
shift
;;
-q)
SOLR_LOG_LEVEL=WARN
+ PASS_TO_RUN_EXAMPLE+=" -Dsolr.log.level=$SOLR_LOG_LEVEL"
shift
;;
-all)
@@ -1797,7 +1896,7 @@ if [ -z "$STOP_PORT" ]; then
fi
if [ "$SCRIPT_CMD" == "start" ] || [ "$SCRIPT_CMD" == "restart" ] ; then
- if [[ "$(whoami)" == "root" ]] && [[ "$FORCE" == "false" ]] ; then
+ if [[ $EUID -eq 0 ]] && [[ "$FORCE" == "false" ]] ; then
echo "WARNING: Starting Solr as the root user is a security risk and not considered best practice. Exiting."
echo " Please consult the Reference Guide. To override this check, start with argument '-force'"
exit 1
@@ -1864,7 +1963,7 @@ fi
LOG4J_CONFIG=()
if [ -n "$LOG4J_PROPS" ]; then
- LOG4J_CONFIG+=("-Dlog4j.configurationFile=file:$LOG4J_PROPS")
+ LOG4J_CONFIG+=("-Dlog4j.configurationFile=$LOG4J_PROPS")
fi
if [ "$SCRIPT_CMD" == "stop" ]; then
@@ -1963,6 +2062,10 @@ else
fi
fi
+# IP-based access control
+IP_ACL_OPTS=("-Dsolr.jetty.inetaccess.includes=${SOLR_IP_WHITELIST}" \
+ "-Dsolr.jetty.inetaccess.excludes=${SOLR_IP_BLACKLIST}")
+
# These are useful for attaching remote profilers like VisualVM/JConsole
if [ "$ENABLE_REMOTE_JMX_OPTS" == "true" ]; then
@@ -1989,6 +2092,16 @@ else
REMOTE_JMX_OPTS=()
fi
+# Enable java security manager (limiting filesystem access and other things)
+if [ "$SOLR_SECURITY_MANAGER_ENABLED" == "true" ]; then
+ SECURITY_MANAGER_OPTS=('-Djava.security.manager' \
+ "-Djava.security.policy=${SOLR_SERVER_DIR}/etc/security.policy" \
+ "-Djava.security.properties=${SOLR_SERVER_DIR}/etc/security.properties" \
+ '-Dsolr.internal.network.permission=*')
+else
+ SECURITY_MANAGER_OPTS=()
+fi
+
JAVA_MEM_OPTS=()
if [ -z "$SOLR_HEAP" ] && [ -n "$SOLR_JAVA_MEM" ]; then
JAVA_MEM_OPTS=($SOLR_JAVA_MEM)
@@ -2023,7 +2136,8 @@ function start_solr() {
'-XX:+ParallelRefProcEnabled' \
'-XX:MaxGCPauseMillis=250' \
'-XX:+UseLargePages' \
- '-XX:+AlwaysPreTouch')
+ '-XX:+AlwaysPreTouch' \
+ '-XX:+ExplicitGCInvokesConcurrent')
else
GC_TUNE=($GC_TUNE)
fi
@@ -2093,12 +2207,14 @@ function start_solr() {
exit 1
fi
- SOLR_START_OPTS=('-server' "${JAVA_MEM_OPTS[@]}" "${GC_TUNE[@]}" "${GC_LOG_OPTS[@]}" \
+ SOLR_START_OPTS=('-server' "${JAVA_MEM_OPTS[@]}" "${GC_TUNE[@]}" "${GC_LOG_OPTS[@]}" "${IP_ACL_OPTS[@]}" \
"${REMOTE_JMX_OPTS[@]}" "${CLOUD_MODE_OPTS[@]}" $SOLR_LOG_LEVEL_OPT -Dsolr.log.dir="$SOLR_LOGS_DIR" \
"-Djetty.port=$SOLR_PORT" "-DSTOP.PORT=$stop_port" "-DSTOP.KEY=$STOP_KEY" \
- "${SOLR_HOST_ARG[@]}" "-Duser.timezone=$SOLR_TIMEZONE" \
+ # '-OmitStackTraceInFastThrow' ensures stack traces in errors,
+ # users who don't care about useful error msgs can override in SOLR_OPTS with +OmitStackTraceInFastThrow
+ "${SOLR_HOST_ARG[@]}" "-Duser.timezone=$SOLR_TIMEZONE" "-XX:-OmitStackTraceInFastThrow" \
"-Djetty.home=$SOLR_SERVER_DIR" "-Dsolr.solr.home=$SOLR_HOME" "-Dsolr.data.home=$SOLR_DATA_HOME" "-Dsolr.install.dir=$SOLR_TIP" \
- "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}")
+ "-Dsolr.default.confdir=$DEFAULT_CONFDIR" "${LOG4J_CONFIG[@]}" "${SOLR_OPTS[@]}" "${SECURITY_MANAGER_OPTS[@]}")
if [ "$SOLR_MODE" == "solrcloud" ]; then
IN_CLOUD_MODE=" in SolrCloud mode"
@@ -2136,13 +2252,13 @@ function start_solr() {
echo ""
fi
# no lsof on cygwin though
- if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path
+ if lsof -v 2>&1 | grep -q revision; then
echo -n "Waiting up to $SOLR_STOP_WAIT seconds to see Solr running on port $SOLR_PORT"
# Launch in a subshell to show the spinner
(loops=0
while true
do
- running=`lsof -PniTCP:$SOLR_PORT -sTCP:LISTEN`
+ running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN)
if [ -z "$running" ]; then
slept=$((loops * 2))
if [ $slept -lt $SOLR_STOP_WAIT ]; then
diff --git a/KeywordSearch/solr/bin/solr.cmd b/KeywordSearch/solr/bin/solr.cmd
index 672ccb98e7bc1d2fdccac22a73f7885f7d45fe71..b25a6be44e754a6310fde7f82d11d2b25bf028d1 100755
--- a/KeywordSearch/solr/bin/solr.cmd
+++ b/KeywordSearch/solr/bin/solr.cmd
@@ -1,8 +1,3 @@
-REM set JAVA_HOME=C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1
-REM set SOLR_SERVER_DIR=C:\Bitnami\solr-8.2.0-2/apache-solr/server
-set SOLR_PORT=8983
-set STOP_PORT=8079
-
@REM
@REM Licensed to the Apache Software Foundation (ASF) under one or more
@REM contributor license agreements. See the NOTICE file distributed with
@@ -21,6 +16,8 @@ set STOP_PORT=8079
@echo off
+@REM Make sure to keep line endings as CRLF for .cmd files
+
IF "%OS%"=="Windows_NT" setlocal enabledelayedexpansion enableextensions
set "PASS_TO_RUN_EXAMPLE="
@@ -85,6 +82,10 @@ IF "%SOLR_SSL_ENABLED%"=="true" (
set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.truststore.type=%SOLR_SSL_TRUST_STORE_TYPE%"
)
+ IF NOT DEFINED SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION (
+ set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"
+ )
+
IF DEFINED SOLR_SSL_NEED_CLIENT_AUTH (
set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.needClientAuth=%SOLR_SSL_NEED_CLIENT_AUTH%"
)
@@ -128,6 +129,11 @@ IF "%SOLR_SSL_ENABLED%"=="true" (
set SOLR_SSL_OPTS=
)
+REM Requestlog options
+IF "%SOLR_REQUESTLOG_ENABLED%"=="true" (
+ set "SOLR_JETTY_CONFIG=!SOLR_JETTY_CONFIG! --module=requestlog"
+)
+
REM Authentication options
IF NOT DEFINED SOLR_AUTH_TYPE (
@@ -219,6 +225,8 @@ IF "%1"=="-v" goto get_version
IF "%1"=="-version" goto get_version
IF "%1"=="assert" goto run_assert
IF "%1"=="autoscaling" goto run_autoscaling
+IF "%1"=="export" goto run_export
+IF "%1"=="package" goto run_package
REM Only allow the command to be the first argument, assume start if not supplied
IF "%1"=="start" goto set_script_cmd
@@ -295,7 +303,7 @@ goto done
:script_usage
@echo.
@echo Usage: solr COMMAND OPTIONS
-@echo where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling
+@echo where COMMAND is one of: start, stop, restart, healthcheck, create, create_core, create_collection, delete, version, zk, auth, assert, config, autoscaling, export
@echo.
@echo Standalone server example (start Solr running in the background on port 8984):
@echo.
@@ -719,11 +727,13 @@ goto parse_args
:set_debug
set SOLR_LOG_LEVEL=DEBUG
+set "PASS_TO_RUN_EXAMPLE=!PASS_TO_RUN_EXAMPLE! -Dsolr.log.level=%SOLR_LOG_LEVEL%"
SHIFT
goto parse_args
:set_warn
set SOLR_LOG_LEVEL=WARN
+set "PASS_TO_RUN_EXAMPLE=!PASS_TO_RUN_EXAMPLE! -Dsolr.log.level=%SOLR_LOG_LEVEL%"
SHIFT
goto parse_args
@@ -995,7 +1005,7 @@ set "EXAMPLE_DIR=%SOLR_TIP%\example"
set TMP_SOLR_HOME=!SOLR_HOME:%EXAMPLE_DIR%=!
IF NOT "%TMP_SOLR_HOME%"=="%SOLR_HOME%" (
set "SOLR_LOGS_DIR=%SOLR_HOME%\..\logs"
- set "LOG4J_CONFIG=file:///%SOLR_SERVER_DIR%\resources\log4j2.xml"
+ set "LOG4J_CONFIG=%SOLR_SERVER_DIR%\resources\log4j2.xml"
)
set IS_RESTART=0
@@ -1028,13 +1038,10 @@ IF "%SCRIPT_CMD%"=="stop" (
del "%SOLR_TIP%"\bin\solr-!SOME_SOLR_PORT!.port
timeout /T 5
REM Kill it if it is still running after the graceful shutdown
- For /f "tokens=2,5" %%M in ('netstat -nao ^| find "TCP " ^| find ":0 " ^| find ":!SOME_SOLR_PORT! "') do (
- IF "%%N"=="%%k" (
- IF "%%M"=="%SOLR_JETTY_HOST%:!SOME_SOLR_PORT!" (
- @echo Forcefully killing process %%N
- taskkill /f /PID %%N
- )
- )
+ IF EXIST "%JAVA_HOME%\bin\jstack.exe" (
+ qprocess "%%k" >nul 2>nul && "%JAVA_HOME%\bin\jstack.exe" %%k && taskkill /f /PID %%k
+ ) else (
+ qprocess "%%k" >nul 2>nul && taskkill /f /PID %%k
)
)
)
@@ -1058,13 +1065,10 @@ IF "%SCRIPT_CMD%"=="stop" (
del "%SOLR_TIP%"\bin\solr-%SOLR_PORT%.port
timeout /T 5
REM Kill it if it is still running after the graceful shutdown
- For /f "tokens=2,5" %%j in ('netstat -nao ^| find "TCP " ^| find ":0 " ^| find ":%SOLR_PORT% "') do (
- IF "%%N"=="%%k" (
- IF "%%j"=="%SOLR_JETTY_HOST%:%SOLR_PORT%" (
- @echo Forcefully killing process %%N
- taskkill /f /PID %%N
- )
- )
+ IF EXIST "%JAVA_HOME%\bin\jstack.exe" (
+ qprocess "%%N" >nul 2>nul && "%JAVA_HOME%\bin\jstack.exe" %%N && taskkill /f /PID %%N
+ ) else (
+ qprocess "%%N" >nul 2>nul && taskkill /f /PID %%N
)
)
)
@@ -1150,6 +1154,10 @@ IF "%SOLR_MODE%"=="solrcloud" (
)
)
+REM IP-based access control
+set IP_ACL_OPTS=-Dsolr.jetty.inetaccess.includes="%SOLR_IP_WHITELIST%" ^
+-Dsolr.jetty.inetaccess.excludes="%SOLR_IP_BLACKLIST%"
+
REM These are useful for attaching remove profilers like VisualVM/JConsole
IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
IF "!RMI_PORT!"=="" set RMI_PORT=1%SOLR_PORT%
@@ -1165,6 +1173,14 @@ IF "%ENABLE_REMOTE_JMX_OPTS%"=="true" (
set REMOTE_JMX_OPTS=
)
+REM Enable java security manager (limiting filesystem access and other things)
+IF "%SOLR_SECURITY_MANAGER_ENABLED%"=="true" (
+ set SECURITY_MANAGER_OPTS=-Djava.security.manager ^
+-Djava.security.policy="%SOLR_SERVER_DIR%\etc\security.policy" ^
+-Djava.security.properties="%SOLR_SERVER_DIR%\etc\security.properties" ^
+-Dsolr.internal.network.permission=*
+)
+
IF NOT "%SOLR_HEAP%"=="" set SOLR_JAVA_MEM=-Xms%SOLR_HEAP% -Xmx%SOLR_HEAP%
IF "%SOLR_JAVA_MEM%"=="" set SOLR_JAVA_MEM=-Xms512m -Xmx512m
IF "%SOLR_JAVA_STACK_SIZE%"=="" set SOLR_JAVA_STACK_SIZE=-Xss256k
@@ -1177,7 +1193,8 @@ IF "%GC_TUNE%"=="" (
-XX:+ParallelRefProcEnabled ^
-XX:MaxGCPauseMillis=250 ^
-XX:+UseLargePages ^
- -XX:+AlwaysPreTouch
+ -XX:+AlwaysPreTouch ^
+ -XX:+ExplicitGCInvokesConcurrent
)
if !JAVA_MAJOR_VERSION! GEQ 9 (
@@ -1250,12 +1267,17 @@ IF "%verbose%"=="1" (
)
set START_OPTS=-Duser.timezone=%SOLR_TIMEZONE%
+REM '-OmitStackTraceInFastThrow' ensures stack traces in errors,
+REM users who don't care about useful error msgs can override in SOLR_OPTS with +OmitStackTraceInFastThrow
+set "START_OPTS=%START_OPTS% -XX:-OmitStackTraceInFastThrow"
set START_OPTS=%START_OPTS% !GC_TUNE! %GC_LOG_OPTS%
IF NOT "!CLOUD_MODE_OPTS!"=="" set "START_OPTS=%START_OPTS% !CLOUD_MODE_OPTS!"
+IF NOT "!IP_ACL_OPTS!"=="" set "START_OPTS=%START_OPTS% !IP_ACL_OPTS!"
IF NOT "%REMOTE_JMX_OPTS%"=="" set "START_OPTS=%START_OPTS% %REMOTE_JMX_OPTS%"
IF NOT "%SOLR_ADDL_ARGS%"=="" set "START_OPTS=%START_OPTS% %SOLR_ADDL_ARGS%"
IF NOT "%SOLR_HOST_ARG%"=="" set "START_OPTS=%START_OPTS% %SOLR_HOST_ARG%"
IF NOT "%SOLR_OPTS%"=="" set "START_OPTS=%START_OPTS% %SOLR_OPTS%"
+IF NOT "!SECURITY_MANAGER_OPTS!"=="" set "START_OPTS=%START_OPTS% !SECURITY_MANAGER_OPTS!"
IF "%SOLR_SSL_ENABLED%"=="true" (
set "SSL_PORT_PROP=-Dsolr.jetty.https.port=%SOLR_PORT%"
set "START_OPTS=%START_OPTS% %SOLR_SSL_OPTS% !SSL_PORT_PROP!"
@@ -1267,7 +1289,7 @@ set SOLR_DATA_HOME_QUOTED="%SOLR_DATA_HOME%"
set "START_OPTS=%START_OPTS% -Dsolr.log.dir=%SOLR_LOGS_DIR_QUOTED%"
IF NOT "%SOLR_DATA_HOME%"=="" set "START_OPTS=%START_OPTS% -Dsolr.data.home=%SOLR_DATA_HOME_QUOTED%"
-IF NOT DEFINED LOG4J_CONFIG set "LOG4J_CONFIG=file:///%SOLR_SERVER_DIR%\resources\log4j2.xml"
+IF NOT DEFINED LOG4J_CONFIG set "LOG4J_CONFIG=%SOLR_SERVER_DIR%\resources\log4j2.xml"
cd /d "%SOLR_SERVER_DIR%"
@@ -1417,7 +1439,23 @@ goto done
-Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
-classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
org.apache.solr.util.SolrCLI %*
-goto done
+goto done:
+
+:run_export
+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
+ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
+ org.apache.solr.util.SolrCLI %*
+goto done:
+
+:run_package
+REM TODO: Compute the running Solr URL and populate it as a parameter (as has been done for the shell script)
+REM Without that, users will have to supply -solrUrl parameter in every request. Life can be so hard for Windows users!
+"%JAVA%" %SOLR_SSL_OPTS% %AUTHC_OPTS% %SOLR_ZK_CREDS_AND_ACLS% -Dsolr.install.dir="%SOLR_TIP%" ^
+ -Dlog4j.configurationFile="file:///%DEFAULT_SERVER_DIR%\resources\log4j2-console.xml" ^
+ -classpath "%DEFAULT_SERVER_DIR%\solr-webapp\webapp\WEB-INF\lib\*;%DEFAULT_SERVER_DIR%\lib\ext\*" ^
+ org.apache.solr.util.SolrCLI %*
+goto done:
:parse_config_args
IF [%1]==[] goto run_config
diff --git a/KeywordSearch/solr/bin/solr.in.cmd b/KeywordSearch/solr/bin/solr.in.cmd
index c3c7302dda4de165bb2f4bce7b0da3225d3e4f55..3eb1dff01ef92095a8a40bbb99ac12eafc991096 100755
--- a/KeywordSearch/solr/bin/solr.in.cmd
+++ b/KeywordSearch/solr/bin/solr.in.cmd
@@ -22,10 +22,10 @@ REM of this file is completely commented.
REM By default the script will use JAVA_HOME to determine which java
REM to use, but you can set a specific path for Solr to use without
REM affecting other Java applications on your server/workstation.
-REM set SOLR_JAVA_HOME=
+set JAVA_HOME=C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1
REM Increase Java Min/Max Heap as needed to support your indexing / query needs
-REM set SOLR_JAVA_MEM=-Xms512m -Xmx512m
+set SOLR_JAVA_MEM=-Xms512m -Xmx4G
REM Configure verbose GC logging:
REM For Java 8: if this is set, additional params will be added to specify the log file & rotation
@@ -34,6 +34,7 @@ REM set GC_LOG_OPTS=-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails -XX:+Prin
REM Various GC settings have shown to work well for a number of common Solr workloads.
REM See solr.cmd GC_TUNE for the default list.
+REM set GC_TUNE=-XX:+ExplicitGCInvokesConcurrent
REM set GC_TUNE=-XX:SurvivorRatio=4
REM set GC_TUNE=%GC_TUNE% -XX:TargetSurvivorRatio=90
REM set GC_TUNE=%GC_TUNE% -XX:MaxTenuringThreshold=8
@@ -46,8 +47,7 @@ REM set GC_TUNE=%GC_TUNE% -XX:+UseCMSInitiatingOccupancyOnly
REM set GC_TUNE=%GC_TUNE% -XX:CMSInitiatingOccupancyFraction=50
REM set GC_TUNE=%GC_TUNE% -XX:CMSMaxAbortablePrecleanTime=6000
REM set GC_TUNE=%GC_TUNE% -XX:+CMSParallelRemarkEnabled
-REM set GC_TUNE=%GC_TUNE% -XX:+ParallelRefProcEnabled
-REM set GC_TUNE=%GC_TUNE% -XX:-OmitStackTraceInFastThrow etc.
+REM set GC_TUNE=%GC_TUNE% -XX:+ParallelRefProcEnabled etc.
REM Set the ZooKeeper connection string if using an external ZooKeeper ensemble
REM e.g. host1:2181,host2:2181/chroot
@@ -55,11 +55,11 @@ REM Leave empty if not using SolrCloud
REM set ZK_HOST=
REM Set the ZooKeeper client timeout (for SolrCloud mode)
-REM set ZK_CLIENT_TIMEOUT=15000
+set ZK_CLIENT_TIMEOUT=60000
REM By default the start script uses "localhost"; override the hostname here
REM for production SolrCloud environments to control the hostname exposed to cluster state
-REM set SOLR_HOST=192.168.1.1
+set SOLR_HOST=localhost
REM By default Solr will try to connect to Zookeeper with 30 seconds in timeout; override the timeout if needed
REM set SOLR_WAIT_FOR_ZK=30
@@ -78,9 +78,12 @@ REM set RMI_PORT=18983
REM Anything you add to the SOLR_OPTS variable will be included in the java
REM start command line as-is, in ADDITION to other options. If you specify the
REM -a option on start script, those options will be appended as well. Examples:
-set SOLR_OPTS=%SOLR_OPTS% -Dbootstrap_confdir="C:\Bitnami\solr-8.2.0-2\apache-solr\server\solr\configsets\AutopsyConfig\conf"
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.autoSoftCommit.maxTime=3000
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.autoCommit.maxTime=60000
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.clustering.enabled=true
+set SOLR_OPTS=%SOLR_OPTS% -Dbootstrap_confdir="C:\Bitnami\solr-8.6.3\server\solr\configsets\AutopsyConfig\conf"
set SOLR_OPTS=%SOLR_OPTS% -Dcollection.configName=AutopsyConfig
-set SOLR_OPTS=%SOLR_OPTS% -Dsolr.default.confdir="C:\Bitnami\solr-8.2.0-2\apache-solr\server\solr\configsets\AutopsyConfig\conf"
+set DEFAULT_CONFDIR="C:\Bitnami\solr-8.6.3\server\solr\configsets\AutopsyConfig\conf"
REM Path to a directory for Solr to store cores and their data. By default, Solr will use server\solr
REM If solr.xml is not stored in ZooKeeper, this directory needs to contain solr.xml
@@ -88,7 +91,7 @@ REM set SOLR_HOME=
REM Path to a directory that Solr will use as root for data folders for each core.
REM If not set, defaults to <instance_dir>/data. Overridable per core through 'dataDir' core property
-REM set SOLR_DATA_HOME=
+set SOLR_DATA_HOME=C:\TEST\DELETE\SOLR_SHARDS
REM Changes the logging level. Valid values: ALL, TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF. Default is INFO
REM This is an alternative to changing the rootLogger in log4j2.xml
@@ -102,32 +105,48 @@ REM start rotation of logs. This is false by default as log4j2 handles this for
REM framework that cannot do startup rotation, you may want to enable this to let Solr rotate logs on startup.
REM set SOLR_LOG_PRESTART_ROTATION=false
+REM Enables jetty request log for all requests
+REM set SOLR_REQUESTLOG_ENABLED=false
+
REM Set the host interface to listen on. Jetty will listen on all interfaces (0.0.0.0) by default.
REM This must be an IPv4 ("a.b.c.d") or bracketed IPv6 ("[x::y]") address, not a hostname!
REM set SOLR_JETTY_HOST=0.0.0.0
REM Sets the port Solr binds to, default is 8983
-REM set SOLR_PORT=8983
+set SOLR_PORT=18983
+set STOP_PORT=8079
+
+REM Restrict access to solr by IP address.
+REM Specify a comma-separated list of addresses or networks, for example:
+REM 127.0.0.1, 192.168.0.0/24, [::1], [2000:123:4:5::]/64
+REM set SOLR_IP_WHITELIST=
+
+REM Block access to solr from specific IP addresses.
+REM Specify a comma-separated list of addresses or networks, for example:
+REM 127.0.0.1, 192.168.0.0/24, [::1], [2000:123:4:5::]/64
+REM set SOLR_IP_BLACKLIST=
REM Enables HTTPS. It is implictly true if you set SOLR_SSL_KEY_STORE. Use this config
REM to enable https module with custom jetty configuration.
REM set SOLR_SSL_ENABLED=true
REM Uncomment to set SSL-related system properties
REM Be sure to update the paths to the correct keystore for your environment
-REM set SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks
+REM set SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.p12
REM set SOLR_SSL_KEY_STORE_PASSWORD=secret
-REM set SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks
+REM set SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.p12
REM set SOLR_SSL_TRUST_STORE_PASSWORD=secret
REM Require clients to authenticate
REM set SOLR_SSL_NEED_CLIENT_AUTH=false
REM Enable clients to authenticate (but not require)
REM set SOLR_SSL_WANT_CLIENT_AUTH=false
+REM Verify client hostname during SSL handshake
+REM set SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
REM SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
REM this to false can be useful to disable these checks when re-using a certificate on many hosts
REM set SOLR_SSL_CHECK_PEER_NAME=true
REM Override Key/Trust Store types if necessary
-REM set SOLR_SSL_KEY_STORE_TYPE=JKS
-REM set SOLR_SSL_TRUST_STORE_TYPE=JKS
+REM set SOLR_SSL_KEY_STORE_TYPE=PKCS12
+REM set SOLR_SSL_TRUST_STORE_TYPE=PKCS12
REM Uncomment if you want to override previously defined SSL values for HTTP client
REM otherwise keep them commented and the above values will automatically be set for HTTP clients
@@ -148,13 +167,13 @@ REM * javax.net.ssl.keyStorePassword
REM * javax.net.ssl.trustStorePassword
REM More info: https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-common/CredentialProviderAPI.html
REM set SOLR_HADOOP_CREDENTIAL_PROVIDER_PATH=localjceks://file/home/solr/hadoop-credential-provider.jceks
-REM set SOLR_OPTS=" -Dsolr.ssl.credential.provider.chain=hadoop"
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.ssl.credential.provider.chain=hadoop
REM Settings for authentication
REM Please configure only one of SOLR_AUTHENTICATION_CLIENT_BUILDER or SOLR_AUTH_TYPE parameters
REM set SOLR_AUTHENTICATION_CLIENT_BUILDER=org.apache.solr.client.solrj.impl.PreemptiveBasicAuthClientBuilderFactory
REM set SOLR_AUTH_TYPE=basic
-REM set SOLR_AUTHENTICATION_OPTS="-Dbasicauth=solr:SolrRocks"
+REM set SOLR_AUTHENTICATION_OPTS=-Dbasicauth=solr:SolrRocks
REM Settings for ZK ACL
REM set SOLR_ZK_CREDS_AND_ACLS=-DzkACLProvider=org.apache.solr.common.cloud.VMParamsAllAndReadonlyDigestZkACLProvider ^
@@ -167,9 +186,25 @@ REM When running Solr in non-cloud mode and if planning to do distributed search
REM list of hosts needs to be whitelisted or Solr will forbid the request. The whitelist can be configured in solr.xml,
REM or if you are using the OOTB solr.xml, can be specified using the system property "solr.shardsWhitelist". Alternatively
REM host checking can be disabled by using the system property "solr.disable.shardsWhitelist"
-REM set SOLR_OPTS="%SOLR_OPTS% -Dsolr.shardsWhitelist=http://localhost:8983,http://localhost:8984"
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.shardsWhitelist=http://localhost:8983,http://localhost:8984
REM For a visual indication in the Admin UI of what type of environment this cluster is, configure
REM a -Dsolr.environment property below. Valid values are prod, stage, test, dev, with an optional
REM label or color, e.g. -Dsolr.environment=test,label=Functional+test,color=brown
-REM SOLR_OPTS="$SOLR_OPTS -Dsolr.environment=prod"
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.environment=prod
+
+REM Specifies the path to a common library directory that will be shared across all cores.
+REM Any JAR files in this directory will be added to the search path for Solr plugins.
+REM If the specified path is not absolute, it will be relative to `%SOLR_HOME%`.
+REM set SOLR_OPTS=%SOLR_OPTS% -Dsolr.sharedLib=/path/to/lib
+
+REM Runs solr in a java security manager sandbox. This can protect against some attacks.
+REM Runtime properties are passed to the security policy file (server\etc\security.policy)
+REM You can also tweak via standard JDK files such as ~\.java.policy, see https://s.apache.org/java8policy
+REM This is experimental! It may not work at all with Hadoop/HDFS features.
+REM set SOLR_SECURITY_MANAGER_ENABLED=false
+
+REM Solr is by default allowed to read and write data from/to SOLR_HOME and a few other well defined locations
+REM Sometimes it may be necessary to place a core or a backup on a different location or a different disk
+REM This parameter lets you specify file system path(s) to explicitly allow. The special value of '*' will allow any path
+REM SOLR_OPTS="%SOLR_OPTS% -Dsolr.allowPaths=D:\,E:\other\path"
diff --git a/KeywordSearch/solr/bin/solr.in.sh b/KeywordSearch/solr/bin/solr.in.sh
index bbded6f238111267f1b9a1cbf45f2dc5538374df..29261ce6e1137c4b194613136d5cb615348bb310 100755
--- a/KeywordSearch/solr/bin/solr.in.sh
+++ b/KeywordSearch/solr/bin/solr.in.sh
@@ -19,7 +19,7 @@
# By default the script will use JAVA_HOME to determine which java
# to use, but you can set a specific path for Solr to use without
# affecting other Java applications on your server/workstation.
-SOLR_JAVA_HOME="C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1"
+#SOLR_JAVA_HOME=""
# This controls the number of seconds that the solr script will wait for
# Solr to stop gracefully or Solr to start. If the graceful stop fails,
@@ -47,6 +47,7 @@ SOLR_JAVA_HOME="C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1"
# These GC settings have shown to work well for a number of common Solr workloads
#GC_TUNE=" \
+#-XX:+ExplicitGCInvokesConcurrent \
#-XX:SurvivorRatio=4 \
#-XX:TargetSurvivorRatio=90 \
#-XX:MaxTenuringThreshold=8 \
@@ -58,8 +59,7 @@ SOLR_JAVA_HOME="C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1"
#-XX:CMSInitiatingOccupancyFraction=50 \
#-XX:CMSMaxAbortablePrecleanTime=6000 \
#-XX:+CMSParallelRemarkEnabled \
-#-XX:+ParallelRefProcEnabled \
-#-XX:-OmitStackTraceInFastThrow etc.
+#-XX:+ParallelRefProcEnabled etc.
# Set the ZooKeeper connection string if using an external ZooKeeper ensemble
# e.g. host1:2181,host2:2181/chroot
@@ -82,7 +82,7 @@ SOLR_JAVA_HOME="C:\Program Files\ojdkbuild\java-1.8.0-openjdk-1.8.0.222-1"
# Set to true to activate the JMX RMI connector to allow remote JMX client applications
# to monitor the JVM hosting Solr; set to "false" to disable that behavior
# (false is recommended in production environments)
-ENABLE_REMOTE_JMX_OPTS="true"
+#ENABLE_REMOTE_JMX_OPTS="false"
# The script will use SOLR_PORT+10000 for the RMI_PORT or you can set it here
# RMI_PORT=18983
@@ -90,9 +90,9 @@ ENABLE_REMOTE_JMX_OPTS="true"
# Anything you add to the SOLR_OPTS variable will be included in the java
# start command line as-is, in ADDITION to other options. If you specify the
# -a option on start script, those options will be appended as well. Examples:
-SOLR_OPTS="$SOLR_OPTS -Dcollection.configName=AutopsyConfig"
-SOLR_OPTS="$SOLR_OPTS -Dbootstrap_confdir=C:\Bitnami\solr-8.2.0-2\apache-solr\server\solr\configsets\AutopsyConfig\conf"
-SOLR_OPTS="$SOLR_OPTS -Dsolr.default.confdir=C:\Bitnami\solr-8.2.0-2\apache-solr\server\solr\configsets\AutopsyConfig\conf"
+#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000"
+#SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=60000"
+#SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
# Location where the bin/solr script will save PID files for running instances
# If not set, the script will create PID files in $SOLR_TIP/bin
@@ -123,28 +123,43 @@ SOLR_OPTS="$SOLR_OPTS -Dsolr.default.confdir=C:\Bitnami\solr-8.2.0-2\apache-solr
# framework that cannot do startup rotation, you may want to enable this to let Solr rotate logs on startup.
#SOLR_LOG_PRESTART_ROTATION=false
+# Enables jetty request log for all requests
+#SOLR_REQUESTLOG_ENABLED=false
+
# Sets the port Solr binds to, default is 8983
#SOLR_PORT=8983
+# Restrict access to solr by IP address.
+# Specify a comma-separated list of addresses or networks, for example:
+# 127.0.0.1, 192.168.0.0/24, [::1], [2000:123:4:5::]/64
+#SOLR_IP_WHITELIST=
+
+# Block access to solr from specific IP addresses.
+# Specify a comma-separated list of addresses or networks, for example:
+# 127.0.0.1, 192.168.0.0/24, [::1], [2000:123:4:5::]/64
+#SOLR_IP_BLACKLIST=
+
# Enables HTTPS. It is implictly true if you set SOLR_SSL_KEY_STORE. Use this config
# to enable https module with custom jetty configuration.
#SOLR_SSL_ENABLED=true
# Uncomment to set SSL-related system properties
# Be sure to update the paths to the correct keystore for your environment
-#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.jks
+#SOLR_SSL_KEY_STORE=etc/solr-ssl.keystore.p12
#SOLR_SSL_KEY_STORE_PASSWORD=secret
-#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.jks
+#SOLR_SSL_TRUST_STORE=etc/solr-ssl.keystore.p12
#SOLR_SSL_TRUST_STORE_PASSWORD=secret
# Require clients to authenticate
#SOLR_SSL_NEED_CLIENT_AUTH=false
# Enable clients to authenticate (but not require)
#SOLR_SSL_WANT_CLIENT_AUTH=false
+# Verify client's hostname during SSL handshake
+#SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
# SSL Certificates contain host/ip "peer name" information that is validated by default. Setting
# this to false can be useful to disable these checks when re-using a certificate on many hosts
#SOLR_SSL_CHECK_PEER_NAME=true
# Override Key/Trust Store types if necessary
-#SOLR_SSL_KEY_STORE_TYPE=JKS
-#SOLR_SSL_TRUST_STORE_TYPE=JKS
+#SOLR_SSL_KEY_STORE_TYPE=PKCS12
+#SOLR_SSL_TRUST_STORE_TYPE=PKCS12
# Uncomment if you want to override previously defined SSL values for HTTP client
# otherwise keep them commented and the above values will automatically be set for HTTP clients
@@ -201,3 +216,19 @@ SOLR_OPTS="$SOLR_OPTS -Dsolr.default.confdir=C:\Bitnami\solr-8.2.0-2\apache-solr
# a -Dsolr.environment property below. Valid values are prod, stage, test, dev, with an optional
# label or color, e.g. -Dsolr.environment=test,label=Functional+test,color=brown
#SOLR_OPTS="$SOLR_OPTS -Dsolr.environment=prod"
+
+# Specifies the path to a common library directory that will be shared across all cores.
+# Any JAR files in this directory will be added to the search path for Solr plugins.
+# If the specified path is not absolute, it will be relative to `$SOLR_HOME`.
+#SOLR_OPTS="$SOLR_OPTS -Dsolr.sharedLib=/path/to/lib"
+
+# Runs solr in java security manager sandbox. This can protect against some attacks.
+# Runtime properties are passed to the security policy file (server/etc/security.policy)
+# You can also tweak via standard JDK files such as ~/.java.policy, see https://s.apache.org/java8policy
+# This is experimental! It may not work at all with Hadoop/HDFS features.
+#SOLR_SECURITY_MANAGER_ENABLED=false
+
+# Solr is by default allowed to read and write data from/to SOLR_HOME and a few other well defined locations
+# Sometimes it may be necessary to place a core or a backup on a different location or a different disk
+# This parameter lets you specify file system path(s) to explicitly allow. The special value of '*' will allow any path
+#SOLR_OPTS="$SOLR_OPTS -Dsolr.allowPaths=/mnt/bigdisk,/other/path"
diff --git a/KeywordSearch/solr/contexts/solr-jetty-context.xml b/KeywordSearch/solr/contexts/solr-jetty-context.xml
deleted file mode 100644
index a84d325e74c646e68cf8eab44538bbddcee1ac15..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/contexts/solr-jetty-context.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="contextPath"><SystemProperty name="hostContext" default="/solr"/></Set>
- <Set name="war"><SystemProperty name="jetty.home"/>/webapps/solr.war</Set>
- <Set name="defaultsDescriptor"><SystemProperty name="jetty.home"/>/etc/webdefault.xml</Set>
-
-</Configure>
diff --git a/KeywordSearch/solr/etc/jetty.xml b/KeywordSearch/solr/etc/jetty.xml
deleted file mode 100644
index 4dbf5070c5b144c2dbacc045f14ccfb869dab9fc..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/etc/jetty.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server -->
-<!-- -->
-<!-- Documentation of this file format can be found at: -->
-<!-- http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax -->
-<!-- -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Server Thread Pool -->
- <!-- =========================================================== -->
- <Set name="ThreadPool">
- <!-- Default queued blocking threadpool -->
- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">10000</Set>
- <Set name="detailedDump">false</Set>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Set connectors -->
- <!-- =========================================================== -->
-
- <!--
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <Set name="host"><SystemProperty name="jetty.host" /></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="8983"/></Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="Acceptors">2</Set>
- <Set name="statsOn">false</Set>
- <Set name="confidentialPort">8443</Set>
- <Set name="lowResourcesConnections">5000</Set>
- <Set name="lowResourcesMaxIdleTime">5000</Set>
- </New>
- </Arg>
- </Call>
- -->
-
- <!-- This connector is currently being used for Solr because it
- showed better performance than nio.SelectChannelConnector
- for typical Solr requests. -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.bio.SocketConnector">
- <Set name="host"><SystemProperty name="jetty.host" default="localhost"/></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="23232"/></Set>
- <Set name="maxIdleTime">50000</Set>
- <Set name="lowResourceMaxIdleTime">1500</Set>
- <Set name="statsOn">false</Set>
- </New>
- </Arg>
- </Call>
-
- <!-- if the connector below is uncommented, then jetty will also accept SSL
- connections on port 8984, using a self signed certificate and can
- optionally require the client to authenticate with a certificate.
- (which can be the same as the server certificate_
-
- # Run solr example with SSL on port 8984
- java -jar start.jar
- #
- # Run post.jar so that it trusts the server cert...
- java -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
- # Run solr example with SSL requiring client certs on port 8984
- java -Djetty.ssl.clientAuth=true -jar start.jar
- #
- # Run post.jar so that it trusts the server cert,
- # and authenticates with a client cert
- java -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.keyStore=../etc/solrtest.keystore -Djavax.net.ssl.trustStore=../etc/solrtest.keystore -Durl=https://localhost:8984/solr/update -jar post.jar *.xml
-
- -->
- <!--
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
- <Arg>
- <New class="org.eclipse.jetty.http.ssl.SslContextFactory">
- <Set name="keyStore"><SystemProperty name="jetty.home" default="."/>/etc/solrtest.keystore</Set>
- <Set name="keyStorePassword">secret</Set>
- <Set name="needClientAuth"><SystemProperty name="jetty.ssl.clientAuth" default="false"/></Set>
- </New>
- </Arg>
- <Set name="port"><SystemProperty name="jetty.ssl.port" default="8984"/></Set>
- <Set name="maxIdleTime">30000</Set>
- </New>
- </Arg>
- </Call>
- -->
-
- <!-- =========================================================== -->
- <!-- Set handler Collection Structure -->
- <!-- =========================================================== -->
- <Set name="handler">
- <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
- <Set name="handlers">
- <Array type="org.eclipse.jetty.server.Handler">
- <Item>
- <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
- </Item>
- <Item>
- <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
- </Item>
- <Item>
- <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
- </Item>
- </Array>
- </Set>
- </New>
- </Set>
-
- <!-- =========================================================== -->
- <!-- Configure Request Log -->
- <!-- =========================================================== -->
- <!--
- <Ref id="Handlers">
- <Call name="addHandler">
- <Arg>
- <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
- <Set name="requestLog">
- <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
- <Set name="filename">
- logs/request.yyyy_mm_dd.log
- </Set>
- <Set name="filenameDateFormat">yyyy_MM_dd</Set>
- <Set name="retainDays">90</Set>
- <Set name="append">true</Set>
- <Set name="extended">false</Set>
- <Set name="logCookies">false</Set>
- <Set name="LogTimeZone">UTC</Set>
- </New>
- </Set>
- </New>
- </Arg>
- </Call>
- </Ref>
- -->
-
- <!-- =========================================================== -->
- <!-- extra options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <Set name="sendServerVersion">false</Set>
- <Set name="sendDateHeader">false</Set>
- <Set name="gracefulShutdown">1000</Set>
- <Set name="dumpAfterStart">false</Set>
- <Set name="dumpBeforeStop">false</Set>
-
-
-
-
- <Call name="addBean">
- <Arg>
- <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
- <Set name="contexts">
- <Ref id="Contexts" />
- </Set>
- <Call name="setContextAttribute">
- <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
- <Arg>.*/servlet-api-[^/]*\.jar$</Arg>
- </Call>
-
-
- <!-- Add a customize step to the deployment lifecycle -->
- <!-- uncomment and replace DebugBinding with your extended AppLifeCycle.Binding class
- <Call name="insertLifeCycleNode">
- <Arg>deployed</Arg>
- <Arg>starting</Arg>
- <Arg>customise</Arg>
- </Call>
- <Call name="addLifeCycleBinding">
- <Arg>
- <New class="org.eclipse.jetty.deploy.bindings.DebugBinding">
- <Arg>customise</Arg>
- </New>
- </Arg>
- </Call>
- -->
-
- </New>
- </Arg>
- </Call>
-
- <Ref id="DeploymentManager">
- <Call name="addAppProvider">
- <Arg>
- <New class="org.eclipse.jetty.deploy.providers.ContextProvider">
- <Set name="monitoredDirName"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
- <Set name="scanInterval">0</Set>
- </New>
- </Arg>
- </Call>
- </Ref>
-
-</Configure>
diff --git a/KeywordSearch/solr/etc/webdefault.xml b/KeywordSearch/solr/etc/webdefault.xml
deleted file mode 100644
index 213138b35fe76e877f2e3bcbd0357cf7e6d1a330..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/etc/webdefault.xml
+++ /dev/null
@@ -1,527 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
- <!-- ===================================================================== -->
- <!-- This file contains the default descriptor for web applications. -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- The intent of this descriptor is to include jetty specific or common -->
- <!-- configuration for all webapps. If a context has a webdefault.xml -->
- <!-- descriptor, it is applied before the contexts own web.xml file -->
- <!-- -->
- <!-- A context may be assigned a default descriptor by: -->
- <!-- + Calling WebApplicationContext.setDefaultsDescriptor -->
- <!-- + Passed an arg to addWebApplications -->
- <!-- -->
- <!-- This file is used both as the resource within the jetty.jar (which is -->
- <!-- used as the default if no explicit defaults descriptor is set) and it -->
- <!-- is copied to the etc directory of the Jetty distro and explicitly -->
- <!-- by the jetty.xml file. -->
- <!-- -->
- <!-- ===================================================================== -->
-<web-app
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- metadata-complete="true"
- version="2.5"
->
-
- <description>
- Default web.xml file.
- This file is applied to a Web application before it's own WEB_INF/web.xml file
- </description>
-
- <!-- ==================================================================== -->
- <!-- Removes static references to beans from javax.el.BeanELResolver to -->
- <!-- ensure webapp classloader can be released on undeploy -->
- <!-- ==================================================================== -->
- <listener>
- <listener-class>org.eclipse.jetty.servlet.listener.ELContextCleaner</listener-class>
- </listener>
-
- <!-- ==================================================================== -->
- <!-- Removes static cache of Methods from java.beans.Introspector to -->
- <!-- ensure webapp classloader can be released on undeploy -->
- <!-- ==================================================================== -->
- <listener>
- <listener-class>org.eclipse.jetty.servlet.listener.IntrospectorCleaner</listener-class>
- </listener>
-
-
- <!-- ==================================================================== -->
- <!-- Context params to control Session Cookies -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!--
- UNCOMMENT TO ACTIVATE <context-param> <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name> <param-value>127.0.0.1</param-value> </context-param> <context-param>
- <param-name>org.eclipse.jetty.servlet.SessionPath</param-name> <param-value>/</param-value> </context-param> <context-param> <param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
- <param-value>-1</param-value> </context-param>
- -->
-
- <!-- ==================================================================== -->
- <!-- The default servlet. -->
- <!-- This servlet, normally mapped to /, provides the handling for static -->
- <!-- content, OPTIONS and TRACE methods for the context. -->
- <!-- The following initParameters are supported: -->
- <!--
- * acceptRanges If true, range requests and responses are
- * supported
- *
- * dirAllowed If true, directory listings are returned if no
- * welcome file is found. Else 403 Forbidden.
- *
- * welcomeServlets If true, attempt to dispatch to welcome files
- * that are servlets, but only after no matching static
- * resources could be found. If false, then a welcome
- * file must exist on disk. If "exact", then exact
- * servlet matches are supported without an existing file.
- * Default is true.
- *
- * This must be false if you want directory listings,
- * but have index.jsp in your welcome file list.
- *
- * redirectWelcome If true, welcome files are redirected rather than
- * forwarded to.
- *
- * gzip If set to true, then static content will be served as
- * gzip content encoded if a matching resource is
- * found ending with ".gz"
- *
- * resourceBase Set to replace the context resource base
- *
- * resourceCache If set, this is a context attribute name, which the servlet
- * will use to look for a shared ResourceCache instance.
- *
- * relativeResourceBase
- * Set with a pathname relative to the base of the
- * servlet context root. Useful for only serving static content out
- * of only specific subdirectories.
- *
- * aliases If True, aliases of resources are allowed (eg. symbolic
- * links and caps variations). May bypass security constraints.
- *
- * maxCacheSize The maximum total size of the cache or 0 for no cache.
- * maxCachedFileSize The maximum size of a file to cache
- * maxCachedFiles The maximum number of files to cache
- *
- * useFileMappedBuffer
- * If set to true, it will use mapped file buffer to serve static content
- * when using NIO connector. Setting this value to false means that
- * a direct buffer will be used instead of a mapped file buffer.
- * By default, this is set to true.
- *
- * cacheControl If set, all static content will have this value set as the cache-control
- * header.
- -->
-
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet>
- <servlet-name>default</servlet-name>
- <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
- <init-param>
- <param-name>aliases</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>acceptRanges</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>dirAllowed</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>welcomeServlets</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>redirectWelcome</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>maxCacheSize</param-name>
- <param-value>256000000</param-value>
- </init-param>
- <init-param>
- <param-name>maxCachedFileSize</param-name>
- <param-value>200000000</param-value>
- </init-param>
- <init-param>
- <param-name>maxCachedFiles</param-name>
- <param-value>2048</param-value>
- </init-param>
- <init-param>
- <param-name>gzip</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>useFileMappedBuffer</param-name>
- <param-value>true</param-value>
- </init-param>
- <!--
- <init-param>
- <param-name>resourceCache</param-name>
- <param-value>resourceCache</param-value>
- </init-param>
- -->
- <!--
- <init-param>
- <param-name>cacheControl</param-name>
- <param-value>max-age=3600,public</param-value>
- </init-param>
- -->
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>default</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
-
- <!-- ==================================================================== -->
- <!-- JSP Servlet -->
- <!-- This is the jasper JSP servlet from the jakarta project -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- The JSP page compiler and execution servlet, which is the mechanism -->
- <!-- used by Glassfish to support JSP pages. Traditionally, this servlet -->
- <!-- is mapped to URL patterh "*.jsp". This servlet supports the -->
- <!-- following initialization parameters (default values are in square -->
- <!-- brackets): -->
- <!-- -->
- <!-- checkInterval If development is false and reloading is true, -->
- <!-- background compiles are enabled. checkInterval -->
- <!-- is the time in seconds between checks to see -->
- <!-- if a JSP page needs to be recompiled. [300] -->
- <!-- -->
- <!-- compiler Which compiler Ant should use to compile JSP -->
- <!-- pages. See the Ant documenation for more -->
- <!-- information. [javac] -->
- <!-- -->
- <!-- classdebuginfo Should the class file be compiled with -->
- <!-- debugging information? [true] -->
- <!-- -->
- <!-- classpath What class path should I use while compiling -->
- <!-- generated servlets? [Created dynamically -->
- <!-- based on the current web application] -->
- <!-- Set to ? to make the container explicitly set -->
- <!-- this parameter. -->
- <!-- -->
- <!-- development Is Jasper used in development mode (will check -->
- <!-- for JSP modification on every access)? [true] -->
- <!-- -->
- <!-- enablePooling Determines whether tag handler pooling is -->
- <!-- enabled [true] -->
- <!-- -->
- <!-- fork Tell Ant to fork compiles of JSP pages so that -->
- <!-- a separate JVM is used for JSP page compiles -->
- <!-- from the one Tomcat is running in. [true] -->
- <!-- -->
- <!-- ieClassId The class-id value to be sent to Internet -->
- <!-- Explorer when using <jsp:plugin> tags. -->
- <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
- <!-- -->
- <!-- javaEncoding Java file encoding to use for generating java -->
- <!-- source files. [UTF-8] -->
- <!-- -->
- <!-- keepgenerated Should we keep the generated Java source code -->
- <!-- for each page instead of deleting it? [true] -->
- <!-- -->
- <!-- logVerbosityLevel The level of detailed messages to be produced -->
- <!-- by this servlet. Increasing levels cause the -->
- <!-- generation of more messages. Valid values are -->
- <!-- FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
- <!-- [WARNING] -->
- <!-- -->
- <!-- mappedfile Should we generate static content with one -->
- <!-- print statement per input line, to ease -->
- <!-- debugging? [false] -->
- <!-- -->
- <!-- -->
- <!-- reloading Should Jasper check for modified JSPs? [true] -->
- <!-- -->
- <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
- <!-- debugging be suppressed? [false] -->
- <!-- -->
- <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
- <!-- dumped to a file? [false] -->
- <!-- False if suppressSmap is true -->
- <!-- -->
- <!-- scratchdir What scratch directory should we use when -->
- <!-- compiling JSP pages? [default work directory -->
- <!-- for the current web application] -->
- <!-- -->
- <!-- tagpoolMaxSize The maximum tag handler pool size [5] -->
- <!-- -->
- <!-- xpoweredBy Determines whether X-Powered-By response -->
- <!-- header is added by generated servlet [false] -->
- <!-- -->
- <!-- If you wish to use Jikes to compile JSP pages: -->
- <!-- Set the init parameter "compiler" to "jikes". Define -->
- <!-- the property "-Dbuild.compiler.emacs=true" when starting Jetty -->
- <!-- to cause Jikes to emit error messages in a format compatible with -->
- <!-- Jasper. -->
- <!-- If you get an error reporting that jikes can't use UTF-8 encoding, -->
- <!-- try setting the init parameter "javaEncoding" to "ISO-8859-1". -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <servlet
- id="jsp"
- >
- <servlet-name>jsp</servlet-name>
- <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
- <init-param>
- <param-name>logVerbosityLevel</param-name>
- <param-value>DEBUG</param-value>
- </init-param>
- <init-param>
- <param-name>fork</param-name>
- <param-value>false</param-value>
- </init-param>
- <init-param>
- <param-name>xpoweredBy</param-name>
- <param-value>false</param-value>
- </init-param>
- <!--
- <init-param>
- <param-name>classpath</param-name>
- <param-value>?</param-value>
- </init-param>
- -->
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>jsp</servlet-name>
- <url-pattern>*.jsp</url-pattern>
- <url-pattern>*.jspf</url-pattern>
- <url-pattern>*.jspx</url-pattern>
- <url-pattern>*.xsp</url-pattern>
- <url-pattern>*.JSP</url-pattern>
- <url-pattern>*.JSPF</url-pattern>
- <url-pattern>*.JSPX</url-pattern>
- <url-pattern>*.XSP</url-pattern>
- </servlet-mapping>
-
- <!-- ==================================================================== -->
- <!-- Dynamic Servlet Invoker. -->
- <!-- This servlet invokes anonymous servlets that have not been defined -->
- <!-- in the web.xml or by other means. The first element of the pathInfo -->
- <!-- of a request passed to the envoker is treated as a servlet name for -->
- <!-- an existing servlet, or as a class name of a new servlet. -->
- <!-- This servlet is normally mapped to /servlet/* -->
- <!-- This servlet support the following initParams: -->
- <!-- -->
- <!-- nonContextServlets If false, the invoker can only load -->
- <!-- servlets from the contexts classloader. -->
- <!-- This is false by default and setting this -->
- <!-- to true may have security implications. -->
- <!-- -->
- <!-- verbose If true, log dynamic loads -->
- <!-- -->
- <!-- * All other parameters are copied to the -->
- <!-- each dynamic servlet as init parameters -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!--
- Uncomment for dynamic invocation <servlet> <servlet-name>invoker</servlet-name> <servlet-class>org.eclipse.jetty.servlet.Invoker</servlet-class> <init-param> <param-name>verbose</param-name>
- <param-value>false</param-value> </init-param> <init-param> <param-name>nonContextServlets</param-name> <param-value>false</param-value> </init-param> <init-param>
- <param-name>dynamicParam</param-name> <param-value>anyValue</param-value> </init-param> <load-on-startup>0</load-on-startup> </servlet> <servlet-mapping> <servlet-name>invoker</servlet-name>
- <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
- -->
-
-
-
- <!-- ==================================================================== -->
- <session-config>
- <session-timeout>30</session-timeout>
- </session-config>
-
- <!-- ==================================================================== -->
- <!-- Default MIME mappings -->
- <!-- The default MIME mappings are provided by the mime.properties -->
- <!-- resource in the org.eclipse.jetty.server.jar file. Additional or modified -->
- <!-- mappings may be specified here -->
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
- <!-- UNCOMMENT TO ACTIVATE
- <mime-mapping>
- <extension>mysuffix</extension>
- <mime-type>mymime/type</mime-type>
- </mime-mapping>
- -->
-
- <!-- ==================================================================== -->
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <!-- ==================================================================== -->
- <locale-encoding-mapping-list>
- <locale-encoding-mapping>
- <locale>ar</locale>
- <encoding>ISO-8859-6</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>be</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>bg</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>ca</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>cs</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>da</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>de</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>el</locale>
- <encoding>ISO-8859-7</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>en</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>es</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>et</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>fi</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>fr</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>hr</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>hu</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>is</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>it</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>iw</locale>
- <encoding>ISO-8859-8</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>ja</locale>
- <encoding>Shift_JIS</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>ko</locale>
- <encoding>EUC-KR</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>lt</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>lv</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>mk</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>nl</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>no</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>pl</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>pt</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>ro</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>ru</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sh</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sk</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sl</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sq</locale>
- <encoding>ISO-8859-2</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sr</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>sv</locale>
- <encoding>ISO-8859-1</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>tr</locale>
- <encoding>ISO-8859-9</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>uk</locale>
- <encoding>ISO-8859-5</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>zh</locale>
- <encoding>GB2312</encoding>
- </locale-encoding-mapping>
- <locale-encoding-mapping>
- <locale>zh_TW</locale>
- <encoding>Big5</encoding>
- </locale-encoding-mapping>
- </locale-encoding-mapping-list>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Disable TRACE</web-resource-name>
- <url-pattern>/</url-pattern>
- <http-method>TRACE</http-method>
- </web-resource-collection>
- <auth-constraint/>
- </security-constraint>
-
-</web-app>
-
diff --git a/KeywordSearch/solr/resources/log4j.properties b/KeywordSearch/solr/resources/log4j.properties
deleted file mode 100644
index 12a26361f53fdccd5dc4d3b8087012d6c294ce6e..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Logging level
-solr.log=logs/
-log4j.rootLogger=WARN, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-4r [%t] %-5p %c %x \u2013 %m%n
-
-# set to INFO to enable infostream log messages
-log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.3.jar
similarity index 94%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.3.jar
index 8abf45fc26ed4df0847f5bda8bd2afba4c21cb16..09479e7bfa9f78831636c8b8d15f81063e995954 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-common-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.3.jar
similarity index 99%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.3.jar
index c86612329662662167dcbd12bd0199340f95a601..b77bc376d88a2d222cf7dcaa4db8a14f2ffb7404 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-kuromoji-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.3.jar
similarity index 99%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.3.jar
index cf890e11f1bc4204c0c23f431e86131146bb1c9a..876475ed186a858d800191a7593904dabe4a2287 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-nori-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.3.jar
similarity index 89%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.3.jar
index cdc9d4163d827beac77739e1e1a960dd89f021d9..731e48d596255337756b49c2d59bfab122359e73 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-analyzers-phonetic-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.3.jar
similarity index 90%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.3.jar
index 9fc41c2f2ee0da01ce13f01b993453c3ba679d05..882ef6dc16f11acb19e3ffffb716ce8fe3c68909 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-backward-codecs-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.3.jar
similarity index 93%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.3.jar
index 02cddfd2a606d3ee213f31209918814ca8839dc6..26a5597cf998e631d0b9cca15789d33ae3e1de87 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-classification-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.3.jar
similarity index 93%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.3.jar
index 33122df7b1f7df54a4e925a7174e9597ff7b8344..bed07de22211b18c4bd75743ad5211035b83221d 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-codecs-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.3.jar
similarity index 92%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.3.jar
index 87918a795d2f6db4e7e6396bb96851625d9132bd..8cd3f6bdc0ccba8e38614eeaedb0396487085c0c 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-core-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.3.jar
similarity index 91%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.3.jar
index 0f691b77fec89044c09c0b2d3c35d30bdb9e3c42..566bfa1a2cbbe954c980791805a5b8dc85406700 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-expressions-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.3.jar
similarity index 90%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.3.jar
index 75e0783ff72bce34de8bd8c499d13f1da7c3e867..014ec65a0e5c20ded6aab7e33ca484b2218b830a 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-grouping-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.3.jar
similarity index 91%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.3.jar
index c039a7ea562747adc8613f5b996b399cae3cf3db..7844c16de9927ab6e2fc3d06732141e4aed8b1c5 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-highlighter-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.3.jar
similarity index 90%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.3.jar
index e109ffcf0bedb6b8e11bc7bee33f5fc9a59bc590..13ae61da9e2fa560f8f58c301569fdac5432aaa0 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-join-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.3.jar
similarity index 90%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.3.jar
index 71cffb39a929f7d8bba25b8e7891b2589da7aab4..5b649100cb0718d6326da2a0de5aaa9b3f83f8c1 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-memory-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.3.jar
similarity index 89%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.3.jar
index 5d264acc14bd740ec52554ca096cd5fc6cf80132..6782e84753ece38816c6a97af0ef7823ab29e52b 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-misc-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.3.jar
similarity index 89%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.3.jar
index 5feaf42ffc65772290f84972580808b932f201dd..3eba9e9034a336d5711c94f50a0d7cb7484d87f9 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queries-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.3.jar
similarity index 90%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.3.jar
index 4b89bd29609eba226af05e544f04209aaa94ac5e..ac56bbda82e6e392be16e9dd7fb9e6645f48d851 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-queryparser-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.3.jar
similarity index 92%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.3.jar
index 7dcbb61ec23446018566979ce3611b26b57a9da7..a718570646956ed8a89ad9deef3f3fd9c9bee0fe 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-sandbox-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.3.jar
similarity index 91%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.3.jar
index fd5325ab6e494815280f5efc50ce5edc2915250c..bf60088d1fb607dd965c9849f616f02acd3cdeed 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial-extras-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.3.jar
similarity index 93%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.3.jar
index 5ab5797e7d8fa16d721975dcf3075d4d001c3554..60a3779b67f0977f0eed7fe5e5fdaf3f1127abb1 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-spatial3d-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.3.jar
similarity index 92%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.3.jar
index d9d6e7b98e1f3c1b01051b4d468b80b599c303fb..b347e54921dab09a106f409546ee67b94c4fa293 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/lucene-suggest-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.3.jar
similarity index 93%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.3.jar
index fa32f4b68334f2a327e1fef0584c44d17675d770..ca1feae0ab97480bbe9b5445546dfb34909264d0 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-core-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.2.jar b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.3.jar
similarity index 92%
rename from KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.2.jar
rename to KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.3.jar
index 084fdc7994e82cb5c49661b1dd45bb0dcc5882a4..759a36bd829291f6a448e153b0837ad5b84fae23 100755
Binary files a/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.2.jar and b/KeywordSearch/solr/server/solr-webapp/webapp/WEB-INF/lib/solr-solrj-8.6.3.jar differ
diff --git a/KeywordSearch/solr/server/solr/README.txt b/KeywordSearch/solr/server/solr/README.txt
deleted file mode 100755
index 6404f2cb7fbbe0d16d5e17372557f98337b42230..0000000000000000000000000000000000000000
--- a/KeywordSearch/solr/server/solr/README.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.
-
-
-Default Solr Home Directory
-=============================
-
-This directory is the default Solr home directory which holds
-configuration files and Solr indexes (called cores).
-
-
-Basic Directory Structure
--------------------------
-
-The Solr Home directory typically contains the following...
-
-* solr.xml *
-
-This is the primary configuration file Solr looks for when starting;
-it specifies high-level configuration options that apply to all
-of your Solr cores, such as cluster-wide SolrCloud settings like
-the ZooKeeper client timeout.
-
-In addition, you can also declare Solr cores in this file, however
-it is recommended to just use automatic core discovery instead of
-listing cores in solr.xml.
-
-If no solr.xml file is found, then Solr assumes that there should be
-a single SolrCore named "collection1" and that the "Instance Directory"
-for collection1 should be the same as the Solr Home Directory.
-
-For more information about solr.xml, please see:
-https://lucene.apache.org/solr/guide/solr-cores-and-solr-xml.html
-
-* Individual SolrCore Instance Directories *
-
-Although solr.xml can be configured to look for SolrCore Instance Directories
-in any path, simple sub-directories of the Solr Home Dir using relative paths
-are common for many installations.
-
-* Core Discovery *
-
-During startup, Solr will scan sub-directories of Solr home looking for
-a specific file named core.properties. If core.properties is found in a
-sub-directory (at any depth), Solr will initialize a core using the properties
-defined in core.properties. For an example of core.properties, please see:
-
-example/solr/collection1/core.properties
-
-For more information about core discovery, please see:
-https://lucene.apache.org/solr/guide/defining-core-properties.html
-
-* A Shared 'lib' Directory *
-
-Although solr.xml can be configured with an optional "sharedLib" attribute
-that can point to any path, it is common to use a "./lib" sub-directory of the
-Solr Home Directory.
-
-* ZooKeeper Files *
-
-When using SolrCloud using the embedded ZooKeeper option for Solr, it is
-common to have a "zoo.cfg" file and "zoo_data" directories in the Solr Home
-Directory. Please see the SolrCloud documentation for more details.
-
-https://lucene.apache.org/solr/guide/solrcloud.html
diff --git a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
index 2ffa675f19b10156750fb36d650d252c8c3f1a3c..9fde79cd365a7e1535458692125aa88ce03c1d5e 100755
--- a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
+++ b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>8.6.2</luceneMatchVersion>
+ <luceneMatchVersion>8.6.3</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load an Jars
identified and use them to resolve any "plugins" specified in
diff --git a/KeywordSearch/solr/server/solr/solr.xml b/KeywordSearch/solr/server/solr/solr.xml
index 4bc82a66061d3146a168468a73730df2db0eff04..1341e89836b35cd8324e995f37d18e71ef06ce2c 100755
--- a/KeywordSearch/solr/server/solr/solr.xml
+++ b/KeywordSearch/solr/server/solr/solr.xml
@@ -40,9 +40,9 @@
<bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
- <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
+ <int name="zkClientTimeout">${zkClientTimeout:60000}</int>
<int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
- <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
+ <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:600000}</int>
<str name="zkCredentialsProvider">${zkCredentialsProvider:org.apache.solr.common.cloud.DefaultZkCredentialsProvider}</str>
<str name="zkACLProvider">${zkACLProvider:org.apache.solr.common.cloud.DefaultZkACLProvider}</str>
@@ -51,7 +51,7 @@
<shardHandlerFactory name="shardHandlerFactory"
class="HttpShardHandlerFactory">
<int name="socketTimeout">${socketTimeout:600000}</int>
- <int name="connTimeout">${connTimeout:60000}</int>
+ <int name="connTimeout">${connTimeout:600000}</int>
<str name="shardsWhitelist">${solr.shardsWhitelist:}</str>
</shardHandlerFactory>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
index 414283c4fc24330ee1a7f534cf233c53acabe417..8ecea5987c8fa2614e82c47943b6d18b0e7723be 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED
@@ -36,7 +36,7 @@ KeywordSearchResultFactory.createNodeForKey.noResultsFound.text=No results found
KeywordSearchResultFactory.query.exception.msg=Could not perform the query
OpenIDE-Module-Display-Category=Ingest Module
-OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\nThe module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
+OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\n\The module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
OpenIDE-Module-Name=KeywordSearch
OptionsCategory_Name_KeywordSearchOptions=Keyword Search
OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search
@@ -350,7 +350,7 @@ SolrSearchService.exceptionMessage.noCurrentSolrCore=IndexMetadata did not conta
# {0} - case directory
SolrSearchService.exceptionMessage.noIndexMetadata=Unable to create IndexMetaData from case directory: {0}
# {0} - collection name
-SolrSearchService.exceptionMessage.unableToDeleteCollection=Unable to delete collection {0}
+SolrSearchService.exceptionMessage.unableToDeleteCollection=Unable to delete colletion {0}
SolrSearchService.indexingError=Unable to index blackboard artifact.
SolrSearchService.ServiceName=Solr Keyword Search Service
SolrSearchService.DeleteDataSource.msg=Error Deleting Solr data for data source id {0}