From c37a46537d6a5c83e83c3623033d140bf0310ffb Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Tue, 18 Sep 2018 17:13:56 -0400 Subject: [PATCH 1/5] Remove embedded Solr Related to: https://jira.duraspace.org/browse/VIVO-1592 --- .gitignore | 3 +- installer/pom.xml | 7 - installer/solr/pom.xml | 140 ------------------ .../main/webResources/META-INF/context.xml | 9 -- .../WEB-INF/classes/log4j.properties | 13 -- 5 files changed, 2 insertions(+), 170 deletions(-) delete mode 100644 installer/solr/pom.xml delete mode 100644 installer/solr/src/main/webResources/META-INF/context.xml delete mode 100644 installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties diff --git a/.gitignore b/.gitignore index 08b9a4b1..425a6cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /build.properties /runtime.properties /ontology/public/catalog-v0001.xml +settings.xml rdf/auth/firsttime/test-user-model.owl utilities/solrtester/.work @@ -11,8 +12,8 @@ utilities/rdbmigration/.work **/.idea **/*.iml **/target - **/overlays +*~ # Eclipse artifacts **/.settings diff --git a/installer/pom.xml b/installer/pom.xml index 22799704..24e42269 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -105,18 +105,11 @@ home - solr webapp - - org.vivoweb - vitro-solr - ${vitro-version} - war - org.vivoweb vivo-home diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml deleted file mode 100644 index 061768e4..00000000 --- a/installer/solr/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - 4.0.0 - - org.vivoweb - vivo-installer-solr - 1.11.0-SNAPSHOT - war - - - org.vivoweb - vivo-installer - 1.11.0-SNAPSHOT - .. - - - VIVO Install Solr App - - - - package - - app-name - - - ${app-name}solr - - - maven-war-plugin - - - - true - - - false - - - org.vivoweb - vitro-solr - war - - - - - src/main/webResources - true - - - - - - - - - pinstall - - tomcat-dir - - - - - maven-antrun-plugin - - - remove-webapp - verify - - run - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - unpack - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - war - true - ${tomcat-dir}/webapps/${project.build.finalName} - - - - - - - - - - - - - - - maven-install-plugin - - true - - - - maven-clean-plugin - - - - overlays - - - - - - - - - - org.vivoweb - vitro-solr - war - - - diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml deleted file mode 100644 index 51e4c1b8..00000000 --- a/installer/solr/src/main/webResources/META-INF/context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties deleted file mode 100644 index 89f1b437..00000000 --- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ -log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender -log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log -log4j.appender.AllAppender.MaxFileSize=10MB -log4j.appender.AllAppender.MaxBackupIndex=10 -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n - -log4j.rootLogger=INFO, AllAppender - -# Make all of the Solr classes quieter... -log4j.logger.org.apache.solr.level = WARNING -# ...except for this one. -log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO From c332e3eacf144589650f0529e17d482ab76213ba Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 26 Sep 2018 16:38:32 -0400 Subject: [PATCH 2/5] Update default startup_listeners.txt for ElasticSearch Related to: https://jira.duraspace.org/browse/VIVO-1600 --- .gitignore | 1 + .../src/main/webapp/WEB-INF/resources/startup_listeners.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 08b9a4b1..bcbfb1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ utilities/rdbmigration/.work **/target **/overlays +*~ # Eclipse artifacts **/.settings diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index e7bdfa88..47dd5659 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -86,7 +86,7 @@ edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup edu.cornell.mannlib.vivo.orcid.OrcidContextSetup -# This should be near the end, because it will issue a warning if the connection to Solr times out. -edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest +# This should be near the end, because it will issue a warning if the connection to Solr or ElasticSearch times out. +edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest org.vivoweb.webapp.startup.i18nSetup From adfbe2295008cec3c0a2caac9dfb985400c1f4bb Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Tue, 18 Sep 2018 17:13:56 -0400 Subject: [PATCH 3/5] Remove embedded Solr Related to: https://jira.duraspace.org/browse/VIVO-1592 --- .gitignore | 3 +- installer/pom.xml | 7 - installer/solr/pom.xml | 140 ------------------ .../main/webResources/META-INF/context.xml | 9 -- .../WEB-INF/classes/log4j.properties | 13 -- 5 files changed, 2 insertions(+), 170 deletions(-) delete mode 100644 installer/solr/pom.xml delete mode 100644 installer/solr/src/main/webResources/META-INF/context.xml delete mode 100644 installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties diff --git a/.gitignore b/.gitignore index 08b9a4b1..425a6cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /build.properties /runtime.properties /ontology/public/catalog-v0001.xml +settings.xml rdf/auth/firsttime/test-user-model.owl utilities/solrtester/.work @@ -11,8 +12,8 @@ utilities/rdbmigration/.work **/.idea **/*.iml **/target - **/overlays +*~ # Eclipse artifacts **/.settings diff --git a/installer/pom.xml b/installer/pom.xml index 4650d6de..e51aa26e 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -105,18 +105,11 @@ home - solr webapp - - org.vivoweb - vitro-solr - ${vitro-version} - war - org.vivoweb vivo-home diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml deleted file mode 100644 index 63fb2130..00000000 --- a/installer/solr/pom.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - 4.0.0 - - org.vivoweb - vivo-installer-solr - 1.11.0-SNAPSHOT - war - - - org.vivoweb - vivo-installer - 1.11.0-SNAPSHOT - .. - - - VIVO Install Solr App - - - - package - - app-name - - - ${app-name}solr - - - maven-war-plugin - - - - true - - - false - - - org.vivoweb - vitro-solr - war - - - - - src/main/webResources - true - - - - - - - - - pinstall - - tomcat-dir - - - - - maven-antrun-plugin - - - remove-webapp - verify - - run - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - unpack - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - war - true - ${tomcat-dir}/webapps/${project.build.finalName} - - - - - - - - - - - - - - - maven-install-plugin - - true - - - - maven-clean-plugin - - - - overlays - - - - - - - - - - org.vivoweb - vitro-solr - war - - - diff --git a/installer/solr/src/main/webResources/META-INF/context.xml b/installer/solr/src/main/webResources/META-INF/context.xml deleted file mode 100644 index 51e4c1b8..00000000 --- a/installer/solr/src/main/webResources/META-INF/context.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties deleted file mode 100644 index 89f1b437..00000000 --- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ -log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender -log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log -log4j.appender.AllAppender.MaxFileSize=10MB -log4j.appender.AllAppender.MaxBackupIndex=10 -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n - -log4j.rootLogger=INFO, AllAppender - -# Make all of the Solr classes quieter... -log4j.logger.org.apache.solr.level = WARNING -# ...except for this one. -log4j.logger.org.apache.solr.core.SolrResourceLoader.level = INFO From f6eb0eb64b97be9a07305df7ab6d264e687a739b Mon Sep 17 00:00:00 2001 From: Andrew Woods Date: Wed, 26 Sep 2018 16:38:32 -0400 Subject: [PATCH 4/5] Update default startup_listeners.txt for ElasticSearch Related to: https://jira.duraspace.org/browse/VIVO-1600 --- .../src/main/webapp/WEB-INF/resources/startup_listeners.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index e7bdfa88..47dd5659 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -86,7 +86,7 @@ edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup edu.cornell.mannlib.vivo.orcid.OrcidContextSetup -# This should be near the end, because it will issue a warning if the connection to Solr times out. -edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest +# This should be near the end, because it will issue a warning if the connection to Solr or ElasticSearch times out. +edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest org.vivoweb.webapp.startup.i18nSetup From 27cb119918cee908942e81127691f17a7d623f49 Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Mon, 24 Jun 2019 08:43:28 -0500 Subject: [PATCH 5/5] fixing merge error --- .../src/main/webapp/WEB-INF/resources/startup_listeners.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index 6d3b1821..a3727d05 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -89,7 +89,7 @@ edu.cornell.mannlib.vivo.orcid.OrcidContextSetup # Register the extensions to the IndividualResponseBuilder (e.g. alt metric, plum analytics) edu.cornell.mannlib.vitro.webapp.controller.individual.VIVOIndividualResponseBuilderExtension$Setup -# This should be near the end, because it will issue a warning if the connection to Solr times out. -edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest +# This should be near the end, because it will issue a warning if the connection to the SearchEngine times out. +edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest org.vivoweb.webapp.startup.i18nSetup