From baef3bccb1fde3abf34241a9287f331c76d3b0b8 Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 8 Sep 2010 18:41:41 +0000
Subject: [PATCH] Put our non-source resources into src/main/resources to
 comply with the standard Maven layout.

I'm not a huge fan of that separation, particularly now that it's de rigueur to
ship your sources with your class files. In such circumstances, one could
imagine just copying the entire contents of src/main/java into target/classes
and being done with it. Class files, XML files, propert files, etc. are all
packaged up together into one happy jar file of goodness. Then you don't have
extra files off in src/main/resources being demure and hard to notice.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2849 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 build-ivy.xml                                 |  9 ++----
 build.xml                                     | 29 ++++++++++++++-----
 .../com/samskivert/Utils.gwt.xml              |  0
 3 files changed, 23 insertions(+), 15 deletions(-)
 rename src/main/{java => resources}/com/samskivert/Utils.gwt.xml (100%)

diff --git a/build-ivy.xml b/build-ivy.xml
index ffd02d4e..fac9a332 100644
--- a/build-ivy.xml
+++ b/build-ivy.xml
@@ -45,13 +45,8 @@
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${tclasses.dir}"/>
     <mkdir dir="${javadoc.dir}"/>
-    <copy todir="${classes.dir}">
-      <fileset dir="${src.dir}" includes="**/*.properties"/>
-      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
-    </copy>
-    <copy todir="${tclasses.dir}">
-      <fileset dir="src/test/resources" includes="**"/>
-    </copy>
+    <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
+    <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
   </target>
 
   <target name="check-ivy" depends="-init-ivy" description="Computes and prints Ivy classpath.">
diff --git a/build.xml b/build.xml
index 3c3b93c7..9eb79df8 100644
--- a/build.xml
+++ b/build.xml
@@ -36,13 +36,8 @@
     <mkdir dir="${classes.dir}"/>
     <mkdir dir="${tclasses.dir}"/>
     <mkdir dir="${javadoc.dir}"/>
-    <copy todir="${classes.dir}">
-      <fileset dir="${src.dir}" includes="**/*.properties"/>
-      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
-    </copy>
-    <copy todir="${tclasses.dir}">
-      <fileset dir="src/test/resources" includes="**"/>
-    </copy>
+    <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
+    <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
     <copy todir="${deploy.dir}/lib" flatten="true">
       <fileset refid="${app.name}.libs"/>
     </copy>
@@ -66,11 +61,29 @@
     <delete dir="${deploy.dir}"/>
   </target>
 
+  <!-- build the java class files -->
+  <target name="imfer" depends="prepare">
+    <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
+           debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
+      <classpath>
+        <path refid="classpath"/>
+        <fileset dir="lib" includes="imferrer.jar"/>
+      </classpath>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+      <!--<compilerarg value="-implicit:class"/>-->
+      <compilerarg value="-proc:only"/>
+    </javac>
+  </target>
+
   <!-- build the java class files -->
   <target name="compile" depends="prepare,compute-builds">
     <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" source="1.5" target="1.5" encoding="utf-8">
-      <classpath refid="classpath"/>
+      <classpath>
+        <path refid="classpath"/>
+        <!--<fileset dir="lib" includes="immuter.jar"/>-->
+      </classpath>
       <exclude name="com/samskivert/net/MailUtil*" unless="build.mail"/>
       <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
       <exclude name="com/samskivert/util/Log4JLogger*" unless="log4j.present"/>
diff --git a/src/main/java/com/samskivert/Utils.gwt.xml b/src/main/resources/com/samskivert/Utils.gwt.xml
similarity index 100%
rename from src/main/java/com/samskivert/Utils.gwt.xml
rename to src/main/resources/com/samskivert/Utils.gwt.xml