Generate event models in the same directory as the corresponding EventProducer interfaces and name it event-model.xml by default

The eventResourceGenerator task now takes a destination directory parameter instead of modelfile



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

1 files changed, 17 insertions, 17 deletions

diff --git a/build.xml b/build.xml
index f85bceecd..026a68b82 100644
--- a/build.xml
+++ b/build.xml
@@ -360,57 +360,57 @@ list of possible build targets.
         <pathelement location="${build.codegen-classes.dir}"/>
       </classpath>
     </taskdef>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/area/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/area/AreaEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/area/AreaEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/ResourceEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/ResourceEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/fo/flow/table/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/fo/flow/table/TableEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/fo/flow/table/TableEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/fo/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/fo/FOValidationEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/fo/FOValidationEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/layoutmgr/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/layoutmgr/BlockLevelEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/layoutmgr/BlockLevelEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/layoutmgr/inline/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/layoutmgr/inline/InlineLevelEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/render/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/RendererEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/RendererEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/svg/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/svg/SVGEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/svg/SVGEventProducer.java"/>
       </fileset>
     </eventResourceGenerator>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/fonts/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/fonts/FontEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/fonts/FontEventProducer.java"/>
@@ -418,14 +418,14 @@ list of possible build targets.
     </eventResourceGenerator>
 
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/accessibility/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/accessibility/AccessibilityEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/accessibility/**/*.java"/>
       </fileset>
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/afp/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/afp/**/*.java"/>
@@ -433,7 +433,7 @@ list of possible build targets.
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/afp/AFPEventProducer.xml" tab="remove" tablength="2"/>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/render/bitmap/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/bitmap/**/*.java"/>
@@ -441,7 +441,7 @@ list of possible build targets.
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/render/bitmap/BitmapRendererEventProducer.xml" tab="remove" tablength="2"/>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/render/pcl/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/pcl/PCLEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/pcl/**/*.java"/>
@@ -449,14 +449,14 @@ list of possible build targets.
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/render/pcl/PCLEventProducer.xml" tab="remove" tablength="2"/>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/render/pdf/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/pdf/PDFEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/pdf/**/*.java"/>
       </fileset>
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/render/pdf/PDFEventProducer.xml" tab="remove" tablength="2"/>
-    <eventResourceGenerator modelfile="${build.gensrc.dir}/org/apache/fop/render/ps/event-model.xml" 
+    <eventResourceGenerator destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/ps/PSEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/ps/**/*.java"/>
@@ -464,7 +464,7 @@ list of possible build targets.
     </eventResourceGenerator>
     <fixcrlf file="${src.java.dir}/org/apache/fop/render/ps/PSEventProducer.xml" tab="remove" tablength="2"/>
     <eventResourceGenerator 
-      modelfile="${build.gensrc.dir}/org/apache/fop/render/rtf/event-model.xml" 
+      destdir="${build.gensrc.dir}" 
       translationfile="${src.java.dir}/org/apache/fop/render/rtf/RTFEventProducer.xml">
       <fileset dir="${src.java.dir}">
         <include name="org/apache/fop/render/rtf/**/*.java"/>
@@ -838,7 +838,7 @@ list of possible build targets.
   </target>
   <target name="junit-compile-copy-resources" if="junit.present">
     <eventResourceGenerator 
-      modelfile="${build.dir}/test-gensrc/org/apache/fop/events/event-model.xml">
+      destdir="${build.dir}/test-gensrc">
       <fileset dir="${test.dir}/java">
         <include name="**/*.java"/>
       </fileset>