From c9aecc016adb5df5a3748902b6bc6ae61468b953 Mon Sep 17 00:00:00 2001
From: David Huynh <dfhuynh@gmail.com>
Date: Sun, 20 Jun 2010 20:27:04 +0000
Subject: [PATCH] Fixed paths in build.xml files so a fresh checkout would
 build now (Issue 79)

git-svn-id: http://google-refine.googlecode.com/svn/trunk@1012 7d457c2a-affb-35e4-300a-418c747d4874
---
 extensions/jython/build.xml           | 8 +++++---
 extensions/sample-extension/build.xml | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/extensions/jython/build.xml b/extensions/jython/build.xml
index a0ff9672b..b321a6515 100644
--- a/extensions/jython/build.xml
+++ b/extensions/jython/build.xml
@@ -26,12 +26,13 @@
         <not><isset property="dist.dir"/></not>
     </condition>
 
-    <property name="fullname" value="gridworks-jython-${version}-${revision}" />
+    <property name="fullname" value="${name}-${version}-${revision}" />
     
     <property name="gridworks.dir" value="${basedir}/../../main" />
+    <property name="gridworks.webinf.dir" value="${gridworks.dir}/webapp/WEB-INF" />
     <property name="gridworks.modinf.dir" value="${gridworks.dir}/webapp/modules/core/MOD-INF" />
-    <property name="gridworks.classes.dir" value="${gridworks.modinf.dir}/classes" />
-    <property name="gridworks.lib.dir" value="${gridworks.dir}/lib" />
+    <property name="gridworks.classes.dir" value="${gridworks.webinf.dir}/classes" />
+    <property name="gridworks.lib.dir" value="${gridworks.webinf.dir}/lib" />
     
     <property name="src.dir" value="${basedir}/src" />
     <property name="module.dir" value="${basedir}/module" />
@@ -46,6 +47,7 @@
         <fileset dir="${gridworks.lib.dir}">
             <include name="**/*.jar" />
         </fileset>
+        <pathelement path="${gridworks.classes.dir}"/>
     </path>
             
     <target name="build_java">
diff --git a/extensions/sample-extension/build.xml b/extensions/sample-extension/build.xml
index f9cea6487..88e5f90ad 100644
--- a/extensions/sample-extension/build.xml
+++ b/extensions/sample-extension/build.xml
@@ -29,9 +29,10 @@
     <property name="fullname" value="${name}-${version}-${revision}" />
     
     <property name="gridworks.dir" value="${basedir}/../../main" />
+    <property name="gridworks.webinf.dir" value="${gridworks.dir}/webapp/WEB-INF" />
     <property name="gridworks.modinf.dir" value="${gridworks.dir}/webapp/modules/core/MOD-INF" />
-    <property name="gridworks.classes.dir" value="${gridworks.modinf.dir}/classes" />
-    <property name="gridworks.lib.dir" value="${gridworks.dir}/lib" />
+    <property name="gridworks.classes.dir" value="${gridworks.webinf.dir}/classes" />
+    <property name="gridworks.lib.dir" value="${gridworks.webinf.dir}/lib" />
     
     <property name="src.dir" value="${basedir}/src" />
     <property name="module.dir" value="${basedir}/module" />
@@ -46,6 +47,7 @@
         <fileset dir="${gridworks.lib.dir}">
             <include name="**/*.jar" />
         </fileset>
+        <pathelement path="${gridworks.classes.dir}"/>
     </path>
             
     <target name="build_java">