From 5c1c0b293675f0680ca73c9bbb573f0813876e74 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 21 Oct 2010 14:42:55 +0000
Subject: [PATCH] NIHVIVO-1258 Modify "productCompile" step in the build so a
 class in the product will replace an identically named class from the Vitro
 core.

---
 webapp/product-build.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 34e6d76da..9c1d99d5d 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$
-->
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
 <!-- ====================================================================== 
      Build script for the Vivo Products.
@@ -134,14 +134,22 @@
           target: productCompile                      
          - - - - - - - - - - - - - - - - - -->
 	<target name="productCompile" depends="productPrepare" if="product.sources.exist">
+		<property name="product.classes.dir" value="${build.dir}/${ant.project.name}/classes" />
+		<mkdir dir="${product.classes.dir}" />
 		<javac srcdir="${product.source.dir}"
-		       destdir="${build.dir}/war/WEB-INF/classes"
+		       destdir="${product.classes.dir}"
 		       debug="true"
 		       deprecation="true"
 		       optimize="true"
 		       source="1.6">
-			<classpath refid="compile.classpath" />
+			<classpath>
+				<path refid="compile.classpath" />
+				<pathelement location="${build.dir}/war/WEB-INF/classes"/>
+			</classpath>
 		</javac>
+		<copy todir="${build.dir}/war/WEB-INF/classes" overwrite="true">
+			<fileset dir="${product.classes.dir}" />
+		</copy>
 	</target>
 
 	<!-- =================================