NIHVIVO-15 Merge three configuration properties files into one. Create ConfigProperties as a central mechanism for reading configuration properties.
This commit is contained in:
jeb228
parent
863992f4ce
commit
a874f4b88a
21 changed files with 382 additions and 585 deletions
|
|
@ -19,10 +19,11 @@ log4j.appender.AllAppender.MaxBackupIndex=10
|
|||
log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout
|
||||
log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n
|
||||
|
||||
log4j.logger.org.apache.catalina=INFO, AllAppender
|
||||
log4j.logger.org.diretwebremoting=ERROR, AllAppender
|
||||
log4j.logger.org.apache.catalina=INFO
|
||||
log4j.logger.org.diretwebremoting=ERROR
|
||||
|
||||
#log4j.logger.edu.cornell.mannlib.vitro.webapp.auth=INFO, AllAppender
|
||||
log4j.logger.edu.cornell.mannlib.vitro.webapp.ConfigurationProperties=INFO
|
||||
#log4j.logger.edu.cornell.mannlib.vitro.webapp.auth=INFO
|
||||
|
||||
#### setup a debugging logger
|
||||
log4j.appender.DebuggingAppender=org.apache.log4j.FileAppender
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
#this is an example of what needs to be in this
|
||||
#file to setup the lucene index directory
|
||||
#
|
||||
# The default location is /usr/local/lucene/vitrodefault
|
||||
|
||||
#You could hard code the location like this:
|
||||
#LuceneSetup.indexDir=/usr/local/lucene/example
|
||||
|
||||
#this line will be setup by ant to work for clones
|
||||
#if you hardcode the dir, this line should be commented out
|
||||
LuceneSetup.indexDir=${luceneIndexDir}
|
||||
|
|
@ -1,80 +0,0 @@
|
|||
################################################################################
|
||||
# DataSource properties file
|
||||
################################################################################
|
||||
|
||||
######################### DataSource Properties ################################
|
||||
|
||||
VitroConnection.DataSource.url=jdbc:mysql://localhost/vitro
|
||||
VitroConnection.DataSource.username=vitroweb
|
||||
VitroConnection.DataSource.password=vitrovitro
|
||||
|
||||
####################### Other Important Properties #############################
|
||||
|
||||
# CHANGE the following property unless you're using Cornell's VIVO ontology
|
||||
Vitro.defaultNamespace=http://vivo.library.cornell.edu/ns/0.1#
|
||||
|
||||
# Uncomment this next line and specify an SMTP host to activate the Contact Us form
|
||||
#Vitro.smtpHost=
|
||||
|
||||
################################################################################
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# maximum number of connections to the db server
|
||||
# This must not be greater than the mysql max_connection parameter.
|
||||
# defaults to 40
|
||||
#VitroConnection.DataSource.MaxActive=40
|
||||
|
||||
# maximum number of connections to the db server to keep
|
||||
# around when nothing is happening.
|
||||
# defaults to 10
|
||||
#VitroConnection.DataSource.MaxIdle=10
|
||||
|
||||
# Time to wait in msec for a result from the sql server
|
||||
# defaults to 10000
|
||||
#VitroConnection.DataSource.MaxWait=10000
|
||||
|
||||
# query to use to test to see if a connection to the db server is live.
|
||||
# defaults to SELECT 1
|
||||
#VitroConnection.DataSource.ValidationQuery=SELECT 1
|
||||
|
||||
# should the connection pool test the connections it gets from the pool?
|
||||
#defaults to true
|
||||
#VitroConnection.DataSource.TestOnBorrow=true
|
||||
|
||||
# should the connection pool test connections it puts back in pool?
|
||||
#defaults to true
|
||||
#VitroConnection.DataSource.TestOnReturn=true
|
||||
|
||||
# Nnumber of milliseconds to sleep between runs of the idle object
|
||||
# evictor thread. When non-positive, no idle object evictor thread will
|
||||
# be run. defaults to 30min
|
||||
#VitroConnection.DataSource.TimeBetweenEvictions=
|
||||
|
||||
# The number of objects to examine during each
|
||||
# run of the idle object evictor thread (if any).
|
||||
# defaults to 3
|
||||
#VitroConnection.DataSource.TestsPerEviction=3
|
||||
|
||||
# The minimum amount of time
|
||||
# an object may sit idle in the pool before it is eligable for eviction
|
||||
# by the idle object evictor (if any).
|
||||
# defaults to 30min
|
||||
#VitroConnection.DataSource.MinEvictionIdleTime=
|
||||
|
||||
################################################ # other notes:
|
||||
# The file checked into source control is example.connection.properties so
|
||||
# that if you have a connection.properties on your machine it will not be
|
||||
# under source control. This is useful so that your customizations for your
|
||||
# database setup are less likely to be checked into source control and then
|
||||
# overwrite other folks' customizations.
|
||||
48
webapp/config/example.deploy.properties
Normal file
48
webapp/config/example.deploy.properties
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
# -----------------------------------------------------------------------------
|
||||
#
|
||||
# VIVO deployment properties
|
||||
#
|
||||
# This file is provided as example.deploy.properties.
|
||||
#
|
||||
# Save a copy of this file as deploy.properties, and edit the properties as
|
||||
# needed for your deployment.
|
||||
#
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
#
|
||||
# The location where the VIVO application will store uploaded files
|
||||
# (usually images). You should arrange for these files to be backed up in some
|
||||
# way.
|
||||
#
|
||||
UploadImagesServlet.sourceDirName = /usr/local/vivo/data/uploads
|
||||
|
||||
#
|
||||
# The location where the VIVO application will create its Lucene search
|
||||
# index.
|
||||
#
|
||||
LuceneSetup.indexDir = /usr/local/vivo/data/luceneIndex
|
||||
|
||||
#
|
||||
# This namespace will be used when generating URIs for objects created in the
|
||||
# editor. Change it to reflect your own domain. For example, Cornell's
|
||||
# namespace is http://vivo.cornell.edu/individual/
|
||||
#
|
||||
# Note: it is essential that this namespace end with a trailing slash.
|
||||
#
|
||||
Vitro.defaultNamespace = http://vitro.mydomain.edu/individual/
|
||||
|
||||
#
|
||||
# SMTP host which the "Contact Us" form can use to send mail. If this is left
|
||||
# empty, the "Contact Us" form will be disabled.
|
||||
#
|
||||
#Vitro.smtpHost =
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
VitroConnection.DataSource.url = jdbc:mysql://localhost/vitro
|
||||
VitroConnection.DataSource.username = vitroweb
|
||||
VitroConnection.DataSource.password = vitrovitro
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# The UploadImagesServlet will upload the images to a directory
|
||||
# that is under tomcat and serve them from there.
|
||||
# This causes a problem when the tomcat/webapps dir is deleted
|
||||
# or deployed because you will lose all the images that the
|
||||
# curators have uploaded. We deal with this by copying
|
||||
# the files to another directory, one that is under version control.
|
||||
|
||||
# This property indicates which non-tomcat directory to save the images in.
|
||||
# ${uploadDir} is defined in the main build.xml via the following statements:
|
||||
#
|
||||
# <!-- defined in globalbuild.properties -->
|
||||
# <property name="source.dir" value="{source.home}"/>
|
||||
# <property name="uploadDir" value="{source.dir}/webapp/web" />
|
||||
#
|
||||
# But, this value will be replaced by the Vitro/clones/build.xml
|
||||
# to point to the clones/{clone}/modifications directory based on the following
|
||||
# <property file="./config/globalbuild.properties"/>
|
||||
# <property name="source.dir" value="{source.home}"/>
|
||||
# <property name="uploadDir" value="${source.dir}/clones/${clone}/modifications"/>
|
||||
#
|
||||
# The UploadImagesServlet.getSourceDirName() method then looks at this parameter
|
||||
# in the upload.properties file, which file is stuck by the clones/build.xml file
|
||||
# into the clone's modifications/WEB-INF/classes directory:
|
||||
UploadImagesServlet.sourceDirName=${uploadDir}
|
||||
|
||||
|
||||
|
|
@ -17,12 +17,13 @@
|
|||
<env-entry>
|
||||
<env-entry-name>jdbc/vitro/connectionType</env-entry-name>
|
||||
<!--
|
||||
How to get a DataSource, Valid valies:
|
||||
SERVER_XML_POOL gets a named DataSource connection from the
|
||||
JNDI context, most likely that was set up tomcat/conf/server.xml
|
||||
PROPERTIES_FILE_POOL makes a DataSource using properties from
|
||||
a file in the classpath at /beans/connection.properties
|
||||
-->
|
||||
How to get a DataSource, Valid values:
|
||||
SERVER_XML_POOL gets a named DataSource connection from the JNDI context,
|
||||
most likely that was set up tomcat/conf/server.xml
|
||||
PROPERTIES_FILE_POOL makes a DataSource using properties from a file that
|
||||
is pointed to by the JNDI name "java:comp/env/path.configuration"
|
||||
(set in the Tomcat context).
|
||||
-->
|
||||
<!-- <env-entry-value>SERVER_XML_POOL</env-entry-value> -->
|
||||
<env-entry-type>java.lang.String</env-entry-type>
|
||||
<env-entry-value>PROPERTIES_FILE_POOL</env-entry-value>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue