Generate event model XMLs in to the build directory: build/gensrc and build/test-gensrc (the latter is new and needs to be setup as source folder in your IDE!)

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback@616900 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -448,16 +448,11 @@ list of possible build targets.
       </classpath>
     </taskdef>
   
-    <eventResourceGenerator modelfile="${src.java.dir}/org/apache/fop/events/event-model.xml">
+    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/events/event-model.xml">
       <fileset dir="${src.java.dir}">
         <include name="**/*.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${basedir}/test/java/org/apache/fop/events/test-event-model.xml">
-      <fileset dir="${basedir}/test/java">
-        <include name="**/*.java"/>
-      </fileset>
-    </eventResourceGenerator>
   </target>
   
   <target name="compile-copy-resources" depends="resourcegen">
@@ -468,6 +463,9 @@ list of possible build targets.
         <include name="**/*.xml"/>
         <include name="**/*.LICENSE.txt"/>
       </fileset>
+      <fileset dir="${build.gensrc.dir}">
+        <include name="**/*.xml"/>
+      </fileset>
     </copy>
     <mkdir dir="${build.viewer.resources.dir}"/>
     <copy todir="${build.viewer.resources.dir}">
@@ -772,6 +770,7 @@ list of possible build targets.
   </target>
   <target name="junit-compile" depends="package, transcoder-pkg, junit-with-xmlunit, junit-without-xmlunit" description="Runs FOP's JUnit tests" if="junit.present">
     <mkdir dir="${build.dir}/test-classes"/>
+    <mkdir dir="${build.dir}/test-gensrc"/>
     <mkdir dir="${junit.reports.dir}"/>
     <javac destdir="${build.dir}/test-classes" fork="${javac.fork}"
            debug="${javac.debug}" deprecation="${javac.deprecation}"
@@ -786,10 +785,18 @@ list of possible build targets.
         </fileset>
       </classpath>
     </javac>
+    <eventResourceGenerator modelfile="${build.dir}/test-gensrc/org/apache/fop/events/test-event-model.xml">
+      <fileset dir="${basedir}/test/java">
+        <include name="**/*.java"/>
+      </fileset>
+    </eventResourceGenerator>
     <copy todir="${build.dir}/test-classes">
       <fileset dir="${basedir}/test/java">
         <include name="**/*.xml"/>
       </fileset>
+      <fileset dir="${build.dir}/test-gensrc">
+        <include name="**/*.xml"/>
+      </fileset>
     </copy>
   </target>
 

src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java

@@ -41,6 +41,7 @@ public class EventProducerCollectorTask extends Task {
         try {
             EventProducerCollector collector = new EventProducerCollector();
             processFileSets(collector);
+            getModelFile().getParentFile().mkdirs();
             collector.saveModelToXML(getModelFile());
             log("Event model written to " + getModelFile());
         } catch (ClassNotFoundException e) {

src/java/org/apache/fop/events/event-model.xml

@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><event-model/>

test/java/org/apache/fop/events/test-event-model.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><event-model>
-<producer name="org.apache.fop.events.TestEventProducer">
-<method name="complain" severity="INFO">
-<parameter type="java.lang.String" name="reason"/>
-<parameter type="java.lang.Integer" name="blah"/>
-</method>
-<method name="enjoy" severity="INFO">
-<parameter type="java.lang.String" name="what"/>
-</method>
-</producer>
-</event-model>