Index: common-build.xml
===================================================================
--- common-build.xml	(revision 772415)
+++ common-build.xml	(working copy)
@@ -350,11 +350,6 @@
         destdir="@{destdir}">
         <classpath refid="@{test.classpath}"/>
       </compile>
-
-      <!-- Copy any data files present to the classpath -->
-      <copy todir="@{destdir}">
-        <fileset dir="@{srcdir}" excludes="**/*.java"/>
-      </copy>
   	</sequential>
   </macrodef>
 	
@@ -533,6 +528,17 @@
         <compilerarg line="-Xmaxwarns 10000000"/>
         <compilerarg line="-Xmaxerrs 10000000"/>
       </javac>
+
+      <!-- Copy any data files present to the build (they will be jared later and be available on classpath) -->
+      <copy todir="@{destdir}" includeEmptyDirs="false">
+        <fileset dir="@{srcdir}">
+          <exclude name="**/*.java"/>
+          <exclude name="**/*.jj"/>
+          <exclude name="**/*.jflex"/>
+          <exclude name="**/overview.html"/>
+          <exclude name="**/package.html"/>
+        </fileset>
+      </copy>
     </sequential>
   </macrodef>