From 2e1ee1fb7992978b148692ffe4a009c5a8df738c Mon Sep 17 00:00:00 2001 From: eugene7646 Date: Mon, 15 May 2023 15:28:01 -0400 Subject: [PATCH] Revert "Merge develop, fix conflicts" --- KeywordSearch/ivy.xml | 3 +- KeywordSearch/nbproject/project.properties | 1 - KeywordSearch/nbproject/project.xml | 4 - .../AutopsyConfig/conf/solrconfig.xml | 2 +- .../keywordsearch/AdHocSearchPanel.java | 4 +- .../autopsy/keywordsearch/Bundle.properties | 18 +- .../keywordsearch/Bundle.properties-MERGED | 27 +- .../keywordsearch/Bundle_ja.properties | 15 + .../autopsy/keywordsearch/Chunker.java | 20 +- .../DropdownListSearchPanel.java | 8 +- .../keywordsearch/ExtractAllTermsReport.java | 9 +- .../keywordsearch/IngestSearchRunner.java | 705 +++++++++++++++++ .../autopsy/keywordsearch/Ingester.java | 185 +---- .../autopsy/keywordsearch/InlineSearcher.java | 614 --------------- .../autopsy/keywordsearch/Keyword.java | 2 - .../autopsy/keywordsearch/KeywordHit.java | 56 +- ...eywordSearchGlobalSearchSettingsPanel.form | 104 ++- ...eywordSearchGlobalSearchSettingsPanel.java | 164 +++- .../KeywordSearchIngestModule.java | 707 +++++++++--------- .../KeywordSearchJobSettings.java | 16 +- .../KeywordSearchJobSettingsPanel.form | 122 +-- .../KeywordSearchJobSettingsPanel.java | 139 ++-- .../KeywordSearchModuleFactory.java | 14 +- .../keywordsearch/KeywordSearchSettings.java | 31 + .../keywordsearch/KeywordSearchUtil.java | 77 -- .../KwsAnalysisResultIngestModule.java | 24 +- .../KwsDataArtifactIngestModule.java | 27 +- .../autopsy/keywordsearch/RegexQuery.java | 54 +- .../keywordsearch/SolrSearchService.java | 32 +- .../recentactivity/ExtractRegistry.java | 9 + 30 files changed, 1661 insertions(+), 1532 deletions(-) create mode 100755 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/IngestSearchRunner.java delete mode 100755 KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/InlineSearcher.java diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml index 174c2e22fd..7b417a99c7 100644 --- a/KeywordSearch/ivy.xml +++ b/KeywordSearch/ivy.xml @@ -18,8 +18,7 @@ - - + diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 4046543d12..d639073ca7 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -44,7 +44,6 @@ file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar file.reference.woodstox-core-6.2.4.jar=release/modules/ext/woodstox-core-6.2.4.jar file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar file.reference.zookeeper-jute-3.8.0.jar=release/modules/ext/zookeeper-jute-3.8.0.jar -file.reference.lucene-core-8.11.2.jar=release/modules/ext/lucene-core-8.11.2.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 c5777d8a14..9b8fa50bda 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -418,10 +418,6 @@ ext/zookeeper-jute-3.8.0.jar release/modules/ext/zookeeper-jute-3.8.0.jar - - ext/lucene-core-8.11.2.jar - release/modules/ext/lucene-core-8.11.2.jar - diff --git a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml index 92ce238a46..9fde79cd36 100755 --- a/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml +++ b/KeywordSearch/solr/server/solr/configsets/AutopsyConfig/conf/solrconfig.xml @@ -301,7 +301,7 @@ 300000 - false + true