Mergin 3856 3851 3838 3830 3829 3828 3827 from vivo 1.4 branch

vivo14.cornell.deploy.properites

@@ -0,0 +1,34 @@
+#Environment.build=development
+
+Vitro.defaultNamespace = http://caruso-laptop.mannlib.cornell.edu:8080/vivo/individual/
+
+vitro.core.dir = ../vitrotrunk
+tomcat.home = /usr/local/tomcat
+
+webapp.name = vivo
+
+vitro.local.solr.url = http://localhost:8080/vivosolr
+
+vitro.home.directory = /usr/local/vivo/data
+
+email.smtpHost = smtp.my.domain.edu
+email.replyTo = vivoAdmin@my.domain.edu
+
+VitroConnection.DataSource.url = jdbc:mysql://localhost/vivotesting
+VitroConnection.DataSource.username = root
+VitroConnection.DataSource.password = RedRed
+
+VitroConnection.DataSource.pool.maxActive = 40
+VitroConnection.DataSource.pool.maxIdle = 10
+VitroConnection.DataSource.dbtype = MySQL
+VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
+VitroConnection.DataSource.validationQuery = SELECT 1
+
+rootUser.emailAddress = vivo_root@mydomain.edu
+
+selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId
+
+externalAuth.buttonText = Log in using BearCat Shibboleth
+externalAuth.netIdHeaderName = remote_userID 
+
+Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; http://purl.org/NET/c4dm/event.owl#Event, event:Event; http://vivoweb.org/ontology/core#Agreement, core:Agreement; http://vivoweb.org/ontology/core#Location, core:Location; http://xmlns.com/foaf/0.1/Organization, foaf:Organization; http://xmlns.com/foaf/0.1/Person, foaf:Person; http://vivoweb.org/ontology/core#InformationResource, core:Information Resource