From df6a62a2cfdd19d6b3d42132aa7efaedfe8db8ba Mon Sep 17 00:00:00 2001
From: David Huynh <dfhuynh@gmail.com>
Date: Sun, 20 Jun 2010 00:44:06 +0000
Subject: [PATCH] Remove extensions/jython/jython/, which has already been
 replaced by extensions/jython/module/; same for
 extensions/sample-extension/sample-extension/. Added build.xml for
 extensions/ and made the root build.xml file call all the extension build.xml
 files. Updated extensions' module.properties files to require the core
 module.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@1005 7d457c2a-affb-35e4-300a-418c747d4874
---
 build.xml                                     |  6 +-
 extensions/build.xml                          | 15 +++++
 .../jython/module/MOD-INF/module.properties   |  1 +
 extensions/sample-extension/.classpath        |  2 +-
 extensions/sample-extension/build.xml         | 64 +++++++++++++++++++
 .../module/MOD-INF/module.properties          |  1 +
 .../modules/core/MOD-INF/module.properties    |  2 +-
 7 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 extensions/build.xml
 create mode 100644 extensions/sample-extension/build.xml

diff --git a/build.xml b/build.xml
index dada97241..5d9f60387 100644
--- a/build.xml
+++ b/build.xml
@@ -150,8 +150,12 @@
         </javac>
         <copy file="${server.tests.src.dir}/tests.log4j.properties" tofile="${server.tests.classes.dir}/tests.log4j.properties"/>
     </target>
+    
+    <target name="build_extensions">
+      <ant dir="extensions/" target="build" />
+    </target>
 
-    <target name="build" depends="build_server, build_webapp"/>
+    <target name="build" depends="build_server, build_webapp, build_extensions"/>
 
     <!-- ================================================================== -->
 
diff --git a/extensions/build.xml b/extensions/build.xml
new file mode 100644
index 000000000..71a0923fc
--- /dev/null
+++ b/extensions/build.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--+
+    |
+    |  Gridworks Extensions Build File    
+    |                
+    +-->
+    
+<project name="gridworks-extensions" default="build" basedir=".">
+  <target name="build">
+    <echo message="Building extensions" />
+    <ant dir="sample-extension/" target="build" />
+    <ant dir="jython/" target="build" />
+  </target>
+</project>
\ No newline at end of file
diff --git a/extensions/jython/module/MOD-INF/module.properties b/extensions/jython/module/MOD-INF/module.properties
index 47d67c197..42b00496a 100644
--- a/extensions/jython/module/MOD-INF/module.properties
+++ b/extensions/jython/module/MOD-INF/module.properties
@@ -1,3 +1,4 @@
 name = jython
 description = Gridworks Jython Extension
 templating = false
+requires = core
diff --git a/extensions/sample-extension/.classpath b/extensions/sample-extension/.classpath
index 82d122a6f..7938e78d6 100644
--- a/extensions/sample-extension/.classpath
+++ b/extensions/sample-extension/.classpath
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="sample-extension/MOD-INF/classes"/>
+	<classpathentry kind="output" path="module/MOD-INF/classes"/>
 </classpath>
diff --git a/extensions/sample-extension/build.xml b/extensions/sample-extension/build.xml
new file mode 100644
index 000000000..f9cea6487
--- /dev/null
+++ b/extensions/sample-extension/build.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--+
+    |
+    |  Gridworks Extension Sample Extension Build File    
+    |                
+    +-->
+    
+<project name="gridworks-sample-extension" default="build" basedir=".">
+
+    <property environment="env"/>
+
+    <condition property="version" value="trunk">
+        <not><isset property="version"/></not>
+    </condition>
+
+    <condition property="revision" value="rXXXX">
+        <not><isset property="revision"/></not>
+    </condition>
+
+    <condition property="full_version" value="0.0.0.0">
+        <not><isset property="full_version"/></not>
+    </condition>
+
+    <condition property="dist.dir" value="dist">
+        <not><isset property="dist.dir"/></not>
+    </condition>
+
+    <property name="fullname" value="${name}-${version}-${revision}" />
+    
+    <property name="gridworks.dir" value="${basedir}/../../main" />
+    <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="src.dir" value="${basedir}/src" />
+    <property name="module.dir" value="${basedir}/module" />
+    <property name="modinf.dir" value="${module.dir}/MOD-INF" />
+    <property name="lib.dir" value="${modinf.dir}/lib" />
+    <property name="classes.dir" value="${modinf.dir}/classes" />
+
+    <path id="class.path">
+        <fileset dir="${lib.dir}">
+            <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${gridworks.lib.dir}">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
+            
+    <target name="build_java">
+        <mkdir dir="${classes.dir}" />
+        <javac destdir="${classes.dir}" debug="true" includeAntRuntime="no">
+            <src path="${src.dir}"/>
+            <classpath refid="class.path" />
+        </javac>
+    </target>
+
+    <target name="build" depends="build_java"/>
+
+    <target name="clean">
+        <delete dir="${classes.dir}" />
+    </target>
+</project>
diff --git a/extensions/sample-extension/module/MOD-INF/module.properties b/extensions/sample-extension/module/MOD-INF/module.properties
index 0acd12f8b..385cb3402 100644
--- a/extensions/sample-extension/module/MOD-INF/module.properties
+++ b/extensions/sample-extension/module/MOD-INF/module.properties
@@ -1,3 +1,4 @@
 name = sample-extension
 description = Gridworks Sample Extension
 templating.macros = macros.vm
+requires = core
diff --git a/main/webapp/modules/core/MOD-INF/module.properties b/main/webapp/modules/core/MOD-INF/module.properties
index 18cd4f845..11a750eb0 100644
--- a/main/webapp/modules/core/MOD-INF/module.properties
+++ b/main/webapp/modules/core/MOD-INF/module.properties
@@ -1,4 +1,4 @@
 description = Gridworks Core Module
-
+implements = core
 templating.macros = macros.vm