From de2fe22338b77ab6ff54653c3b5748f2414c0351 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 29 Apr 2010 20:24:25 +0000
Subject: [PATCH] NIHVIVO-213 Modify product-build so a /src directory does not
 require a productMods/WEB-INF/lib directory.

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

diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index ed9a1c0aa..05d1b6ae3 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -47,12 +47,21 @@
 	<property name="product.modifications.dir" location="./modifications" />
 	<available property="product.modifications.exist" file="${product.modifications.dir}" />
 
+	<!-- If there is a WEB-INF/lib in the mods directory, it goes into the compile classpath -->
+	<!-- Otherwise, use a real directory but disable the "include" in the fileset -->
+	<available property="product.mods.lib.exists" file="${product.modifications.dir}/WEB-INF/lib" />
+	<condition property="product.mods.lib.dir"
+	           value="${product.modifications.dir}/WEB-INF/lib"
+	           else="${webapp.dir}/lib">
+		<available file="${product.modifications.dir}/WEB-INF/lib" />
+	</condition>
+
 	<path id="product.compile.classpath">
 		<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 dir="${product.mods.lib.dir}">
+			<include name="**/*.jar" if="product.mods.lib.exists" />
 		</fileset>
 
 		<path refid="compile.classpath" />