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

NIHVIVO-56 Merge modifications and supplements into one directory, and make it configurable. Include any added JARs in the product-compile path.

Browse source
This commit is contained in:
jeb228 2010-02-21 20:47:07 +00:00
parent e28f10d2bc
commit 6e97a7158b
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
webapp/product-build.xml
View file

@ -43,8 +43,18 @@
<property name="product.themes.dir" location="./themes" /> <property name="product.themes.dir" location="./themes" />
<available property="product.themes.exist" file="${product.themes.dir}" /> <available property="product.themes.exist" file="${product.themes.dir}" />
<!-- Is there a modifications directory in the product? -->
<property name="product.modifications.dir" location="./modifications" />
<available property="product.modifications.exist" file="${product.modifications.dir}" />
<path id="product.compile.classpath"> <path id="product.compile.classpath">
<pathelement location="${classes.dir}" /> <pathelement location="${classes.dir}" />
<!-- These come before the core classpath, so our local mods can override -->
<fileset dir="${product.modifications.dir}/WEB-INF/lib">
<include name="**/*.jar" />
</fileset>
<path refid="compile.classpath" /> <path refid="compile.classpath" />
</path> </path>
@ -110,19 +120,6 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<fileset dir="${product.themes.dir}" /> <fileset dir="${product.themes.dir}" />
</copy> </copy>
<!-- TODO: Merge these into the productMods -->
<copy todir="${build.dir}/war/WEB-INF/ontologies/user">
<fileset dir="./ontology" />
</copy>
<copy todir="${build.dir}/war/WEB-INF/submodels">
<fileset dir="./model/submodels" />
</copy>
<copy todir="${build.dir}/war/WEB-INF/init-data">
<fileset dir="./model/init-data" />
</copy>
<!-- TODO: Merge these into the productMods -->
<!-- TODO: Have the Jena code read the userId directly from the deploy.properties --> <!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
<copy file="config/vitroUsers.owl.template" <copy file="config/vitroUsers.owl.template"
tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl" tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl"
@ -134,7 +131,7 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<!-- TODO: Have the Jena code read the userId directly from the deploy.properties --> <!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
<copy todir="${build.dir}/war"> <copy todir="${build.dir}/war">
<fileset dir="./modifications" /> <fileset dir="${product.modifications.dir}" />
</copy> </copy>
</target> </target>
@ -144,14 +141,14 @@ deploy - Deploy the application directly into the Tomcat webapps directory.
<target name="productCompile" depends="vitroCore.compile" if="product.sources.exist"> <target name="productCompile" depends="vitroCore.compile" if="product.sources.exist">
<!-- deletes all files that depend on changed .java files --> <!-- deletes all files that depend on changed .java files -->
<depend srcdir="${product.source.dir}" <depend srcdir="${product.source.dir}"
destdir="${classes.dir}" destdir="${build.dir}/war/WEB-INF/classes"
closure="false" closure="false"
cache="${build.dir}/.depcache"> cache="${build.dir}/.depcache">
<classpath refid="product.compile.classpath" /> <classpath refid="product.compile.classpath" />
</depend> </depend>
<javac srcdir="${product.source.dir}" <javac srcdir="${product.source.dir}"
destdir="${classes.dir}" destdir="${build.dir}/war/WEB-INF/classes"
debug="true" debug="true"
deprecation="true" deprecation="true"
optimize="true" optimize="true"