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

22
utilities/pre-compileJSPs/jsp-build.xml
View file

@ -10,23 +10,23 @@
".build/war" directory is current.
====================================================================== -->
<project name="Check JSPs for compile errors" default="all" basedir="../..">
<!-- Get tomcat.home and webapp.name from the deploy.properties file. -->
<property name="deploy.properties.file" location="deploy.properties" />
<fail message="You must create a &quot;${deploy.properties.file}&quot; file.">
<!-- Get tomcat.home and webapp.name from the build.properties file. -->
<property name="build.properties.file" location="build.properties" />
<fail message="You must create a &quot;${build.properties.file}&quot; file.">
<condition>
<not>
<available file="${deploy.properties.file}" />
<available file="${build.properties.file}" />
</not>
</condition>
</fail>
<property file="${deploy.properties.file}" />
<property file="${build.properties.file}" />
<fail unless="tomcat.home"
message="${deploy.properties.file} must contain a value for tomcat.home" />
message="${build.properties.file} must contain a value for tomcat.home" />
<fail unless="webapp.name"
message="${deploy.properties.file} must contain a value for webapp.name" />
message="${build.properties.file} must contain a value for webapp.name" />
<property name="build.jsp.dir" location=".build/jsp" />
<property name="build.war.dir" location=".build/war" />
<property name="build.webapp.dir" location=".build/main/webapp" />
<!-- Where are the Tomcat classes? -->
<path id="jasper.classpath">
@ -41,8 +41,8 @@
<!-- Add in the project classes -->
<path id="compile.classpath">
<path refid="jasper.classpath" />
<pathelement location="${build.war.dir}/WEB-INF/classes" />
<fileset dir="${build.war.dir}/WEB-INF/lib">
<pathelement location="${build.webapp.dir}/WEB-INF/classes" />
<fileset dir="${build.webapp.dir}/WEB-INF/lib">
<include name="*.jar" />
</fileset>
</path>
@ -65,7 +65,7 @@
<target name="jspc" depends="prepare">
<jasper2 validateXml="false"
uriroot="${build.war.dir}"
uriroot="${build.webapp.dir}"
webXmlFragment="${build.jsp.dir}generated_web.xml"
outputDir="${build.jsp.dir}/src"
trimSpaces="true"