Update example config files to current best practices (#229)

home/src/main/resources/config/example.applicationSetup.n3

@@ -26,7 +26,7 @@
     :hasSearchIndexer             :basicSearchIndexer ;
     :hasImageProcessor            :iioImageProcessor ;
     :hasFileStorage               :ptiFileStorage ;
-    :hasContentTripleSource       :sdbContentTripleSource ;
+    :hasContentTripleSource       :tdbContentTripleSource ;
     :hasConfigurationTripleSource :tdbConfigurationTripleSource ;
     :hasTBoxReasonerModule        :jfactTBoxReasonerModule .
 
@@ -82,22 +82,22 @@
 # ----------------------------
 #
 # Content triples source module: holds data contents
-#    The SDB-based implementation is the default option. It reads its parameters
+#    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 a local TDB instance, a "standard" SPARQL
+#    Other implementations are based on an SDB instance, a "standard" SPARQL
 #    endpoint, or a Virtuoso endpoint, with parameters as shown.
 #
 
-:sdbContentTripleSource
-    a   vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB ,
-        vitroWebapp:modules.tripleSource.ContentTripleSource .
+#:sdbContentTripleSource
+#    a   vitroWebapp:triplesource.impl.sdb.ContentTripleSourceSDB ,
+#        vitroWebapp:modules.tripleSource.ContentTripleSource .
 
-#:tdbContentTripleSource
-#    a   vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB ,
-#        vitroWebapp:modules.tripleSource.ContentTripleSource ;
-#    # May be an absolute path, or relative to the Vitro home directory.
-#    :hasTdbDirectory "tdbContentModels" .
+:tdbContentTripleSource
+    a   vitroWebapp:triplesource.impl.tdb.ContentTripleSourceTDB ,
+        vitroWebapp:modules.tripleSource.ContentTripleSource ;
+    # May be an absolute path, or relative to the Vitro home directory.
+    :hasTdbDirectory "tdbContentModels" .
 
 #:sparqlContentTripleSource
 #    a   vitroWebapp:triplesource.impl.virtuoso.ContentTripleSourceSPARQL ,

home/src/main/resources/config/example.runtime.properties

@@ -24,51 +24,58 @@ Vitro.defaultNamespace = http://vivo.mydomain.edu/individual/
 
 #
 # URL of Solr context used in local Vitro search. This will usually consist of:
-#     scheme + server_name + port + vitro_webapp_name + "solr"
-# In the standard installation, the Solr context will be on the same server as Vitro,
-# and in the same Tomcat instance. The path will be the Vitro webapp.name (specified
-# above) + "solr"
+#     scheme + server_name + port + "solr" + solr_core_name
+# In a standard Solr installation, the Solr service will be available on port
+# 8983. The path will be /solr followed by the name used when adding a core
+# for Vitro.
 #   Example:
-#     vitro.local.solr.url = http://localhost:8080/vitrosolr
-vitro.local.solr.url = http://localhost:8080/vitrosolr
+#     vitro.local.solr.url = http://localhost:8983/solr/vitrocore
+#
+vitro.local.solr.url = http://localhost:8983/solr/vitrocore
 
 #
 # Email parameters which VIVO can use to send mail. If these are left empty,
 # the "Contact Us" form will be disabled and users will not be notified of
 # changes to their accounts.
-#
-email.smtpHost = smtp.my.domain.edu
-email.replyTo = vivoAdmin@my.domain.edu
+  #   Example:
+  #     email.smtpHost = smtp.mydomain.edu
+  #     email.replyTo = vitroAdmin@mydomain.edu
+  #
+email.smtpHost =
+email.replyTo =
 
 #
-# The basic parameters for a MySQL database connection. Change the end of the
-# URL to reflect your database name (if it is not "vitro"). Change the username
-# and password to match the authorized user you created in MySQL.
+# NOTE: VitroConnection.DataSource.* properties are only used in conjuction with
+#       an SDB triple store.
 #
-VitroConnection.DataSource.url = jdbc:mysql://localhost/vitro
-VitroConnection.DataSource.username = vitroweb
-VitroConnection.DataSource.password = vitrovitro
+# 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
+# and password to match the authorized database user you created.
+#
+# VitroConnection.DataSource.url = jdbc:mysql://localhost/vitrodb
+# VitroConnection.DataSource.username = vitrodbUsername
+# VitroConnection.DataSource.password = vitrodbPassword
 
 #
 # The maximum number of active connections in the database connection pool.
 # Increase this value to support a greater number of concurrent page requests.
 #
-VitroConnection.DataSource.pool.maxActive = 40
+# VitroConnection.DataSource.pool.maxActive = 40
 
 #
 # The maximum number of database connections that will be allowed
 # to remain idle in the connection pool.  Default is 25%
 # of the maximum number of active connections.
 #
-VitroConnection.DataSource.pool.maxIdle = 10
+# VitroConnection.DataSource.pool.maxIdle = 10
 
 #
-# Parameters to change in order to use VIVO with a database other than
+# Parameters to change in order to use Vitro with a database other than
 # MySQL.
 #
-VitroConnection.DataSource.dbtype = MySQL
-VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
-VitroConnection.DataSource.validationQuery = SELECT 1
+# VitroConnection.DataSource.dbtype = MySQL
+# VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
+# VitroConnection.DataSource.validationQuery = SELECT 1
 
 #
 # Include sections between <precise-subquery></precise-subquery>