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

6
productMods/templates/freemarker/body/harvester/fileharvest.ftl
View file

@ -16,7 +16,7 @@
<h2><a class="ingestMenu" href="${urls.base}/ingest" title="Return to the Data Ingest Tools menu">Ingest Menu</a> > ${jobSpecificHeader}</h2>
<#-- check to ensure harvester.location is set in deploy.properties -->
<#-- check to ensure harvester.location is set in runtime.properties -->
<#if harvesterLocation?has_content>
<script type="text/javascript">
@ -181,7 +181,7 @@
<ol>
<li>VIVO Harvester is installed.</li>
<li>The <em>harvester.location</em> property in deploy.properties is pointed to the Harvester installation directory.</li>
<li>The <em>harvester.location</em> property in runtime.properties is pointed to the Harvester installation directory.</li>
<li>In VIVO Harvester, the web server user (typically tomcat6) has read and write access to the <em>vivo/</em> directory and all of its children.</li>
<li>In VIVO Harvester, the <em>logs/</em> directory exists and the web server user has read and write access to it.</li>
<li>In VIVO Harvester, the file <em>vivo/config/vivo.xml</em> is properly configured with your database information and namespace.</li>
@ -265,7 +265,7 @@
<#else>
<div id="fileHarvestErrorHelp">
<p>The <em>harvester.location</em> property in deploy.properties is undefined.</p>
<p>The <em>harvester.location</em> property in runtime.properties is undefined.</p>
<p>In order to use this feature, please define a value for this property that points to the Harvester installation directory before redeploying and restarting the application.</p>
</div>