From db7838dfabdb02282f3a4a2a9ddd3c03e2694d35 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Tue, 7 Mar 2023 08:45:17 -0600 Subject: [PATCH] VIVO 3828: Remove SDB in preparation to moving to new Jena. There are only comments and properties to remove. --- .../resources/config/example.applicationSetup.n3 | 8 ++------ .../resources/config/example.runtime.properties | 14 ++++++-------- .../webResources/WEB-INF/classes/log4j.properties | 2 -- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/home/src/main/resources/config/example.applicationSetup.n3 b/home/src/main/resources/config/example.applicationSetup.n3 index 0acd91f0f1..a3b7b38e5a 100644 --- a/home/src/main/resources/config/example.applicationSetup.n3 +++ b/home/src/main/resources/config/example.applicationSetup.n3 @@ -85,14 +85,10 @@ # The TDB-based implementation is the default option. It reads its parameters # from the runtime.properties file, for backward compatibility. # -# Other implementations are based on an SDB instance, a "standard" SPARQL -# endpoint, or a Virtuoso endpoint, with parameters as shown. +# Other implementations are a "standard" SPARQL endpoint or a Virtuoso +# endpoint, with parameters as shown. # -#:sdbContentTripleSource -# a vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB , -# vitroWebapp:modules.tripleSource.ContentTripleSource . - :tdbContentTripleSource a vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB , vitroWebapp:modules.tripleSource.ContentTripleSource ; diff --git a/home/src/main/resources/config/example.runtime.properties b/home/src/main/resources/config/example.runtime.properties index 0f22433b70..86c66fb5e7 100644 --- a/home/src/main/resources/config/example.runtime.properties +++ b/home/src/main/resources/config/example.runtime.properties @@ -56,8 +56,8 @@ argon2.memory = 1024 argon2.time = 1000 # - # NOTE: VitroConnection.DataSource.* properties are only used in conjuction with - # an SDB triple store. + # NOTE: VitroConnection.DataSource.* properties are only used by OpenSocial for + # SQL database interaction. # # The basic parameters for a database connection. Change the end of the # URL to reflect your database name (if it is not "vitrodb"). Change the username @@ -152,21 +152,19 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId # VitroConnection.DataSource.pool.maxIdle = 10 # ----------------------------------------------------------------------------- -# USING A DIFFERENT DATABASE +# USING AN SQL DATABASE # ----------------------------------------------------------------------------- # # Parameters to change in order to use VIVO with a database other than - # MySQL. + # MySQL. This may be required for OpenSocial. # # VitroConnection.DataSource.dbtype = MySQL # VitroConnection.DataSource.driver = com.mysql.jdbc.Driver # VitroConnection.DataSource.validationQuery = SELECT 1 - # Note: the above parameters allow you to change the relational database that - # is used as the back end for Jena SDB. If you want to use a triple store - # other than SDB, you will need to edit applicationSetup.n3. See the - # installation instructions for more details. + # Note: you may need to edit applicationSetup.n3. See the installation + # instructions for more details. # ----------------------------------------------------------------------------- diff --git a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties index 5cdfd31cd8..88747e03f4 100644 --- a/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties +++ b/installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties @@ -39,8 +39,6 @@ log4j.logger.edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase= log4j.logger.org.semanticweb.owlapi.rdf.rdfxml.parser=WARN # suppress odd warnings from libraries -log4j.logger.org.apache.jena.sdb.layout2.LoaderTuplesNodes=FATAL -log4j.logger.org.apache.jena.sdb.sql.SDBConnection=ERROR log4j.logger.org.openjena.riot=FATAL log4j.logger.org.apache.jena.riot=FATAL log4j.logger.org.directwebremoting=WARN