diff --git a/example.deploy.properties b/example.deploy.properties new file mode 100644 index 00000000..2636a178 --- /dev/null +++ b/example.deploy.properties @@ -0,0 +1,146 @@ +# ----------------------------------------------------------------------------- +# +# 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. +# +# ----------------------------------------------------------------------------- + +# +# 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://vivo.mydomain.edu/individual/ + +# +# Where is the Vitro core directory? +# In most deployments, this is set to ./vitro-core (It is not uncommon for this +# setting to point elsewhere in development environments). +# Examples: +# vitro.core.dir = ./vitro-core +# vitro.core.dir = ../vitro +# vitro.core.dir = /usr/local/vitro/trunk +vitro.core.dir = ./vitro-core + +# +# The base install directory for your Tomcat server. The VIVO application +# will be deployed in the /webapps directory below this base. +# +tomcat.home = /usr/local/tomcat + +# +# The name of the VIVO application. This will be used as the name of the +# subdirectory within your Tomcat server's /webapps directory. It also appears +# in the URL for the application. For example, http://my.vivo.server/vivo +# +webapp.name = vivo + +# +# URL of Solr context used in local VIVO search. Should consist of +# scheme + servername + port + contextpath + "solr" +# +vitro.local.solr.url = http://localhost:8080/vivosolr + +# +# The location where the VIVO application will store the data that it creates. +# This includes uploaded files (usually images) and the Lucene search index. +# +vitro.home.directory = /usr/local/vivo/data + +# +# 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 + +# +# 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 + +# +# 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 + +# +# Parameters to change in order to use VIVO with a database other than +# MySQL. +# +VitroConnection.DataSource.dbtype = MySQL +VitroConnection.DataSource.driver = com.mysql.jdbc.Driver +VitroConnection.DataSource.validationQuery = SELECT 1 + +# +# The email address of the root user for the VIVO application. The password +# for this user is initially set to "rootPassword", but you will be asked to +# change the password the first time you log in. +# +rootUser.emailAddress = root@myDomain.com + +# +# How is a logged-in user associated with a particular Individual? One way is +# for the Individual to have a property whose value is the username of the user. +# This value should be the URI for that property. +# +selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId + +# +# If an external authentication system like Shibboleth or CUWebAuth is to be +# used, these properties say how the login button should be labeled, and which +# HTTP header will contain the user ID from the authentication system. If such +# a system is not to be used, leave these commented out. Consult the +# installation instructions for more details. +# +#externalAuth.buttonText = Log in using BearCat Shibboleth +#externalAuth.netIdHeaderName = remote_userID + +# +# The temporal graph visualization can require extensive machine resources. +# This can have a particularly noticable impact on memory usage if +# - The organization tree is deep, +# - The number of grants and publications is large. +# VIVO release 1.2 guards against this impact by disabling the temporal graph +# visualization unless the "visualization.temporal" flag is set to "enabled". +# +# visualization.temporal = enabled + +# +# The temporal graph visualization is used to compare different organizations/people +# within an organization on parameters like number of publications or grants. +# By default, the app will attempt to make its best guess at the top level +# organization in your instance. If you're unhappy with this selection, uncomment out +# the property below and set it to the URI of the organization individual you want to +# identify as the top level organization. It will be used as the default whenever the +# temporal graph visualization is rendered without being passed an explicit org. +# For example, to use "Ponce School of Medicine" as the top organization: +# visualization.topLevelOrg = http://vivo.psm.edu/individual/n2862 +# +# visualization.topLevelOrg = http://vivo.mydomain.edu/individual/topLevelOrgURI + +# +# Default type(s) for Google Refine Reconciliation Service +# The format for this property is id, name; id1, name1; id2, name2 etc. +# See Service Metadata from this page http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi +# for more information. +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 diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp index cee0dab0..2390270d 100644 --- a/productMods/edit/forms/addClinicalRoleToPerson.jsp +++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp @@ -3,8 +3,6 @@ - - - - diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp index 01ee33d3..e1e79e7f 100644 --- a/productMods/edit/forms/addMemberRoleToPerson.jsp +++ b/productMods/edit/forms/addMemberRoleToPerson.jsp @@ -3,8 +3,6 @@ - - diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp index 5873b078..c9beec5c 100644 --- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp +++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp @@ -3,8 +3,6 @@ - - - - - - diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp index 8102cb52..00096a0f 100644 --- a/productMods/edit/forms/addResearcherRoleToPerson.jsp +++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp @@ -3,8 +3,6 @@ - - ${param.roleActivityTypeLabel} @@ -83,8 +85,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ${param.roleActivityType_objectClassUri} ${param.roleActivityType_literalOptions} ${! empty param.numDateFields ? param.numDateFields : 2 } -${param.roleToActivityPredicate} -${param.activityToRolePredicate} +${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"} +${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"} <% VitroRequest vreq = new VitroRequest(request); diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp index 844ae0c5..ccab85c6 100644 --- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp +++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp @@ -3,8 +3,6 @@ - - diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp index 7d1757d8..3ea87099 100644 --- a/productMods/edit/forms/addTeacherRoleToPerson.jsp +++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp @@ -3,8 +3,6 @@ - - diff --git a/productMods/templates/freemarker/body/individual/individual-menu.ftl b/productMods/templates/freemarker/body/individual/individual-menu.ftl deleted file mode 100644 index 3a08c665..00000000 --- a/productMods/templates/freemarker/body/individual/individual-menu.ftl +++ /dev/null @@ -1,21 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Default VIVO individual profile page template (extends individual.ftl in vitro) --> - -<#include "individual-setup.ftl"> - -<#assign individualProductExtension> - <#-- Include for any class specific template additions --> - ${classSpecificExtension!} - - <#include "individual-overview.ftl"> - - - - -<#include "individual-menu-vitro.ftl"> - -${stylesheets.add('')} - -${headScripts.add('')} -${scripts.add('')} diff --git a/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl b/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl deleted file mode 100644 index a6b9b6d2..00000000 --- a/productMods/templates/freemarker/body/partials/individual/individual-menu-properties.ftl +++ /dev/null @@ -1,40 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Template for property listing on individual profile page --> - -<#import "lib-properties.ftl" as p> -<#list propertyGroups.all as group> - - <#assign groupName = group.getName(nameForOtherGroup)> -
- - - <#-- Display the group heading --> - <#if groupName?has_content> -

${groupName?capitalize}

- - - <#-- List the properties in the group --> - <#list group.properties as property> -
- <#-- Property display name --> -

${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />

- <#-- List the statements for each property --> -
    - - <#-- data property --> - <#if property.type == "data"> - <@p.dataPropertyList property editable /> - <#-- object property --> - <#else> - <@p.objectProperty property editable property.template /> - -
-
- -
- \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl b/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl deleted file mode 100644 index 18f1a82b..00000000 --- a/productMods/templates/freemarker/body/partials/individual/individual-menu-vitro.ftl +++ /dev/null @@ -1,21 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- Default individual profile page template --> -<#--@dumpAll /--> - -<#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> - -<#-- Menu Ontology properties --> -<#include "individual-menu-properties.ftl"> - -${stylesheets.add('')} - -${headScripts.add('', - '', - '', - '', - '', - '', - '')} - -${scripts.add('')} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index a5cf8650..c003fd20 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl @@ -16,7 +16,11 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.infoResource??> - ${statement.infoResourceLabel!statement.infoResourceName} + <#if statement.activity??> + ${statement.infoResourceLabel!statement.infoResourceName} ${statement.activityLabel!statement.activityName} + <#else> + ${statement.infoResourceLabel!statement.infoResourceName} + <#elseif statement.activity??> ${statement.activityLabel!statement.activityName} <#else>