litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-2 Modify the build so installers can create a container-neutral VIVO.

Browse source 
Split deploy.properties into build.properties and runtime.properties, with runtime.properties going into the Vitro home directory. Modify ConfigurationProperties to locate the Vitro home directory, either by System property or JNDI Environment variable, or from build.properties, and to read from both build.properties and runtime.properties. Revise the install and upgrade documents for VIVO and Vitro. Change comments and error messages that referred to deploy.properties by name.
This commit is contained in:
j2blake 2013-01-16 14:52:35 -05:00
parent aab76220c7
commit 89f759fcbc
14 changed files with 942 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java
View file

@ -180,7 +180,7 @@ public class FileHarvestController extends FreemarkerHttpServlet {
{
String pathToHarvester = ConfigurationProperties.getBean(req).getProperty("harvester.location");
if (pathToHarvester == null) {
log.error("The deploy.properties file does not contain a value for 'harvester.location'");
log.error("The runtime.properties file does not contain a value for 'harvester.location'");
return "";
}
return pathToHarvester;

2
src/edu/cornell/mannlib/vitro/webapp/visualization/temporalgraph/OrganizationUtilityFunctions.java
View file

@ -120,7 +120,7 @@ public class OrganizationUtilityFunctions {
.getProperty("visualization.topLevelOrg");
/*
* First checking if the staff has provided highest level organization in deploy.properties
* First checking if the staff has provided highest level organization in runtime.properties
* if so use to temporal graph vis.
*/
if (StringUtils.isNotBlank(staffProvidedHighestLevelOrganization)) {