Merged revisions 647692,647742,647745 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

................
  r647692 | jeremias | 2008-04-14 09:25:22 +0100 (Mon, 14 Apr 2008) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-615152" from 
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback
................
  r647742 | jeremias | 2008-04-14 12:53:29 +0100 (Mon, 14 Apr 2008) | 298 lines
  
  Merged branch
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ProcessingFeedback
  into Trunk.
  
  Changes on branch:
  ........
    r615153 | jeremias | 2008-01-25 10:07:21 +0100 (Fr, 25 Jan 2008) | 1 line
    
    Created temporary branch for processing feedback.
  ........
    r615155 | jeremias | 2008-01-25 10:11:59 +0100 (Fr, 25 Jan 2008) | 1 line
    
    Initial commit of what I've built already for those who prefer code to minimalistic design docs.
  ........
    r615278 | jeremias | 2008-01-25 18:25:00 +0100 (Fr, 25 Jan 2008) | 1 line
    
    EventProducer interfaces now operational.
  ........
    r615773 | jeremias | 2008-01-28 10:06:16 +0100 (Mo, 28 Jan 2008) | 1 line
    
    No casting in client code when creating EventProducer instances.
  ........
    r616242 | vhennebert | 2008-01-29 11:34:45 +0100 (Di, 29 Jan 2008) | 3 lines
    
    Trick to avoid hard-coding the class name of EventProducer in the source file.
    Feel free to revert if it's not ok.
  ........
    r616900 | jeremias | 2008-01-30 21:59:31 +0100 (Mi, 30 Jan 2008) | 1 line
    
    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!)
  ........
    r616907 | jeremias | 2008-01-30 22:12:59 +0100 (Mi, 30 Jan 2008) | 1 line
    
    Added an XMLResourceBundle that uses an XML file instead of a properties file to load the translations. The XML format is the same as for Cocoon's XMLResourceBundle.
  ........
    r617097 | vhennebert | 2008-01-31 11:53:21 +0100 (Do, 31 Jan 2008) | 2 lines
    
    Minor typo + slight improvement of Javadoc
  ........
    r617176 | jeremias | 2008-01-31 19:14:19 +0100 (Do, 31 Jan 2008) | 5 lines
    
    Renamed FopEvent to Event as suggested by Simon.
    EventProducerCollectorTask.java now reads the EventSeverity from a doclet tag.
    Added generation of EventProducer translations (including simple merging, no validation, yet)
    EventFormatter introduced (only basic functionality, yet).
    Added a simple EventListener implementation that uses EventFormatter to convert the events to human-readable, localized messages that are sent to the log via Commons Logging.
  ........
    r617362 | jeremias | 2008-02-01 08:18:07 +0100 (Fr, 01 Feb 2008) | 1 line
    
    Some remaining rename operations based on an earlier discussion.
  ........
    r617413 | jeremias | 2008-02-01 10:46:26 +0100 (Fr, 01 Feb 2008) | 2 lines
    
    Extracted formatting functionality into utility class AdvancedMessageFormat.java.
    AdvancedMessageFormat.java now supports conditional sub-groups (delimited by []).
  ........
    r618682 | jeremias | 2008-02-05 17:07:08 +0100 (Di, 05 Feb 2008) | 1 line
    
    Add support for special object formatters (where toString() isn't good enough). ATM, it's hard-coded but could later be hooked into dynamic discovery if we have multiple such formatters. The SAX Locator is the only example for now.
  ........
    r618686 | jeremias | 2008-02-05 17:12:56 +0100 (Di, 05 Feb 2008) | 3 lines
    
    Hooked most of FONode into the new event mechanism. The FOUserAgent provides a DefaultEventBroadcaster instance.
    If a producer method declares throwing an exception, the event is automatically marked FATAL and the dynamic proxy throws an exception right after notifying the listeners.
    The exceptions are created through the EventExceptionManager. It currently contains only one exception factory for ValidationException. If we need more such factories it's better to register them dynamically. Right now, they're hard-coded.
  ........
    r619313 | jeremias | 2008-02-07 10:14:15 +0100 (Do, 07 Feb 2008) | 1 line
    
    Make sure no events are now just silently swallowed because after upgrading a user doesn't know about the event system.
  ........
    r619314 | jeremias | 2008-02-07 10:14:46 +0100 (Do, 07 Feb 2008) | 1 line
    
    Log what translation file is being written.
  ........
    r619320 | jeremias | 2008-02-07 10:31:00 +0100 (Do, 07 Feb 2008) | 2 lines
    
    FObj hooked into the event system.
    Code reduction using a protected method on FONode to acquire a FOValidationEventProducer.
  ........
    r619359 | jeremias | 2008-02-07 11:59:19 +0100 (Do, 07 Feb 2008) | 2 lines
    
    Fop's QName now extends XGCommons' QName to initiate a transition.
    Hooked PropertyList into the event mechanism.
  ........
    r631252 | jeremias | 2008-02-26 16:24:33 +0100 (Di, 26 Feb 2008) | 1 line
    
    Removed superfluous warning.
  ........
    r631268 | jeremias | 2008-02-26 17:08:11 +0100 (Di, 26 Feb 2008) | 1 line
    
    Deprecated two methods which are a problem for localization. Also helps finding additional spots to switch over to the event mechanism.
  ........
    r633852 | jeremias | 2008-03-05 15:20:24 +0100 (Mi, 05 Mrz 2008) | 1 line
    
    Add severity to formatting parameters.
  ........
    r633855 | jeremias | 2008-03-05 15:21:57 +0100 (Mi, 05 Mrz 2008) | 4 lines
    
    Added support for additional field styles:
    {<fieldname>,if,<true-text>,<false-text>}
    {<fieldname>,equals,<test-string>,<true-text>,<false-text>}
  ........
    r633856 | jeremias | 2008-03-05 15:24:04 +0100 (Mi, 05 Mrz 2008) | 2 lines
    
    Javadocs and TODOs.
    EventListeners can change the event severity.
  ........
    r633857 | jeremias | 2008-03-05 15:27:08 +0100 (Mi, 05 Mrz 2008) | 4 lines
    
    Javadocs.
    Moved out event listener registration into a CompositeEventListener.
    Event broadcaster uses the events effective severity, not the initial value (for the case where listeners override the initial value).
    Set up a special EventBroadCaster in the FOUserAgent that filters events through a class (FOValidationEventListenerProxy) that adjusts the event severity for relaxed validation.
  ........
    r633858 | jeremias | 2008-03-05 15:32:07 +0100 (Mi, 05 Mrz 2008) | 2 lines
    
    Instead of always decentrally checking whether strict validation is enabled or not, this is now done in a special event listener. The event producer method caller simply indicates whether it can recover from the error condition and continue.
    Started switching to event production in table FOs.
  ........
    r634027 | jeremias | 2008-03-05 21:58:35 +0100 (Mi, 05 Mrz 2008) | 7 lines
    
    Moved AdvancedMessageFormat into its own package.
    AdvancedMessageFormat got the following added functionality:
    - Alternative conditional regions [ bla {field}] -> [ bla {field1}| even more bla {field2}]
    - Functions: functions get access to the parameters and they can produce an object that is then formatted ({#gatherContextInfo})
    - "if" and "equals" format moved to top-level classes and added by dynamic registration.
    EventFormatter now supports includes in the form {{includeName}} so you can include other entries from the resource bundle for better reuse.
    Some more events in table code.
  ........
    r634031 | jeremias | 2008-03-05 22:05:22 +0100 (Mi, 05 Mrz 2008) | 1 line
    
    SVN Props
  ........
    r634208 | jeremias | 2008-03-06 11:26:52 +0100 (Do, 06 Mrz 2008) | 2 lines
    
    Improved context gathering.
    Moved GatherContextInfoFunction to an inner class of FONode to reduce visibilities.
  ........
    r634209 | jeremias | 2008-03-06 11:28:14 +0100 (Do, 06 Mrz 2008) | 1 line
    
    Made FOPException localizable.
  ........
    r634280 | jeremias | 2008-03-06 15:38:30 +0100 (Do, 06 Mrz 2008) | 2 lines
    
    ExceptionFactory is now dynamically registered.
    More table warnings and errors switch to events.
  ........
    r634326 | jeremias | 2008-03-06 17:08:16 +0100 (Do, 06 Mrz 2008) | 1 line
    
    Remaining table FOs switched to events.
  ........
    r634328 | jeremias | 2008-03-06 17:09:21 +0100 (Do, 06 Mrz 2008) | 1 line
    
    Deprecated FOP's QName. Mixing with Commons' variant only produces problems.
  ........
    r634381 | jeremias | 2008-03-06 20:12:57 +0100 (Do, 06 Mrz 2008) | 2 lines
    
    Made the "invalidChild" event fully localizable by adding a "lookup" field for the optional rule to be displayed.
    And a few switches to the event system.
  ........
    r634692 | jeremias | 2008-03-07 15:31:43 +0100 (Fr, 07 Mrz 2008) | 1 line
    
    More FO tree stuff switched to events.
  ........
    r634712 | jeremias | 2008-03-07 16:19:21 +0100 (Fr, 07 Mrz 2008) | 1 line
    
    Avoid an NPE that says nothing (ex. could happen if the message template is wrong).
  ........
    r634738 | jeremias | 2008-03-07 17:38:21 +0100 (Fr, 07 Mrz 2008) | 2 lines
    
    Non-FO children were not properly run through validation by FOTreeBuilder.
    Unified the way that non-FO elements are validated. Some FOs were already fixed. I now fixed the rest, so foreign elements can occur everywhere.
  ........
    r637833 | jeremias | 2008-03-17 12:01:41 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Exception while cloning for RetrieveMarker to be handled by user as suggested by Andreas.
  ........
    r637835 | jeremias | 2008-03-17 12:03:31 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Throw a RuntimeException of no other Exception class is specified for an event as a fallback if someone just sets the event severity to FATAL.
  ........
    r637838 | jeremias | 2008-03-17 12:06:10 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Throw a meaningful exception when the property name is wrong. Otherwise, there will be an ArrayIndexOutOfBoundsException.
  ........
    r637859 | jeremias | 2008-03-17 13:35:26 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Throw a meaningful exception when the property name is wrong. Otherwise, there will be an ArrayIndexOutOfBoundsException.
  ........
    r637938 | jeremias | 2008-03-17 16:19:51 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Switched pagination package to events.
  ........
    r637947 | jeremias | 2008-03-17 16:45:16 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Removed unlocalizable validation helper methods.
  ........
    r637952 | jeremias | 2008-03-17 16:59:02 +0100 (Mo, 17 Mrz 2008) | 1 line
    
    Events on FOTreeBuilder.
  ........
    r638299 | jeremias | 2008-03-18 11:09:30 +0100 (Di, 18 Mrz 2008) | 2 lines
    
    Added support for java.util.text's ChoiceFormat to AdvancedMessageFormat.
    Reuse the regexes as constants.
  ........
    r638302 | jeremias | 2008-03-18 11:17:06 +0100 (Di, 18 Mrz 2008) | 1 line
    
    Events for inline-level layout managers.
  ........
    r638774 | jeremias | 2008-03-19 11:17:36 +0100 (Mi, 19 Mrz 2008) | 1 line
    
    Added DEBUG level.
  ........
    r638777 | jeremias | 2008-03-19 11:23:40 +0100 (Mi, 19 Mrz 2008) | 3 lines
    
    Generalized FOValidationEventListenerProxy into FOPEventListenerProxy, the main proxy for FOP's own event manipulation proxy. Done because of support for overflow="hidden" vs. overflow="error-if-overflow".
    Switched block-level layout managers to events.
    Some cleanup along the way.
  ........
    r639222 | jeremias | 2008-03-20 10:27:34 +0100 (Do, 20 Mrz 2008) | 2 lines
    
    Some initial work for event forwarding from Batik.
    Missing errors/exceptions converted to events in PageSequenceMaster.
  ........
    r639270 | jeremias | 2008-03-20 13:50:35 +0100 (Do, 20 Mrz 2008) | 1 line
    
    Removed DEBUG event severity again. Promoted constrained geometry adjustment event to INFO level as per discussion.
  ........
    r640395 | jeremias | 2008-03-24 13:39:13 +0100 (Mo, 24 Mrz 2008) | 3 lines
    
    Moved the creation of the fallback LoggingEventListener to FOUserAgent so event before the startDocument() SAX event arrive in the log.
    Dynamic discovery of event models. Renderers and extensions can register renderer-specific event models.
    Switched the most important parts of the renderers to events (maybe not everything is converted).
  ........
    r640397 | jeremias | 2008-03-24 13:43:04 +0100 (Mo, 24 Mrz 2008) | 1 line
    
    Remaining fixcrlfs. Xalan likes to mix CRLF and LF on Windows.
  ........
    r640398 | jeremias | 2008-03-24 13:43:54 +0100 (Mo, 24 Mrz 2008) | 1 line
    
    Ignore namespace declarations for property handling.
  ........
    r640463 | jeremias | 2008-03-24 17:59:52 +0100 (Mo, 24 Mrz 2008) | 2 lines
    
    Event in area package.
    Exposed getUserAgent() in Renderer interface (was already public in AbstractRenderer).
  ........
    r642972 | jeremias | 2008-03-31 14:18:39 +0200 (Mo, 31 Mrz 2008) | 1 line
    
    Code restructured a bit.
  ........
    r642975 | jeremias | 2008-03-31 14:24:07 +0200 (Mo, 31 Mrz 2008) | 2 lines
    
    Plugged fonts package into the event subsystem. Note: I did not follow the same pattern as for the rest as the font package is to be considered FOP-external, so I just added a manual adapter for the FontEventListener. This demonstrates how an external library can be integrated with the event system.
    Missing warning for unknown formatting objects added. Warning is not issued by the ElementMappingRegistry anymore but by FOTreeBuilder which has access to more context information.
  ........
    r642997 | jeremias | 2008-03-31 16:10:08 +0200 (Mo, 31 Mrz 2008) | 1 line
    
    Added an example to demonstrate how to write your own event listener and how to deal with the exceptions thrown in the process.
  ........
    r642998 | jeremias | 2008-03-31 16:13:40 +0200 (Mo, 31 Mrz 2008) | 1 line
    
    Removed unused method. Event formatting should not be part of the Event class. Use EventFormatter.format(Event) instead.
  ........
    r643066 | jeremias | 2008-03-31 19:18:54 +0200 (Mo, 31 Mrz 2008) | 1 line
    
    First part of the event subsystem documentation (DRAFT).
  ........
    r643784 | jeremias | 2008-04-02 10:05:33 +0200 (Mi, 02 Apr 2008) | 1 line
    
    More documentation.
  ........
    r643785 | jeremias | 2008-04-02 10:06:38 +0200 (Mi, 02 Apr 2008) | 1 line
    
    Some nits.
  ........
    r643787 | jeremias | 2008-04-02 10:24:41 +0200 (Mi, 02 Apr 2008) | 1 line
    
    Completed javadocs
  ........
    r643824 | jeremias | 2008-04-02 12:00:30 +0200 (Mi, 02 Apr 2008) | 1 line
    
    Javadocs.
  ........
    r645847 | vhennebert | 2008-04-08 12:54:16 +0200 (Di, 08 Apr 2008) | 2 lines
    
    Minor typo fixes
  ........
    r645848 | vhennebert | 2008-04-08 12:58:30 +0200 (Di, 08 Apr 2008) | 2 lines
    
    Another small typo fix
  ........
    r647678 | jeremias | 2008-04-14 09:20:26 +0200 (Mo, 14 Apr 2008) | 1 line
    
    Renamed *EventProducer.Factory.create() to *EventProducer.Provider.get() to better reflect what the method does (instances may be cached and reused).
  ........
................
  r647745 | jeremias | 2008-04-14 13:01:06 +0100 (Mon, 14 Apr 2008) | 1 line
  
  svnmerge didn't work for me in this case. Remove svn merge info.
................


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

5 files changed, 501 insertions, 0 deletions

diff --git a/src/codegen/java/org/apache/fop/tools/EventConventionException.java b/src/codegen/java/org/apache/fop/tools/EventConventionException.java
new file mode 100644
index 000000000..675f4a0ca
--- /dev/null
+++ b/src/codegen/java/org/apache/fop/tools/EventConventionException.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.tools;
+
+public class EventConventionException extends Exception {
+
+    public EventConventionException(String message) {
+        super(message);
+    }
+    
+}
diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
new file mode 100644
index 000000000..e42395ae7
--- /dev/null
+++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
@@ -0,0 +1,183 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.tools;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.fop.events.EventProducer;
+import org.apache.fop.events.model.EventMethodModel;
+import org.apache.fop.events.model.EventModel;
+import org.apache.fop.events.model.EventProducerModel;
+import org.apache.fop.events.model.EventSeverity;
+
+import com.thoughtworks.qdox.JavaDocBuilder;
+import com.thoughtworks.qdox.model.DefaultDocletTagFactory;
+import com.thoughtworks.qdox.model.DocletTag;
+import com.thoughtworks.qdox.model.DocletTagFactory;
+import com.thoughtworks.qdox.model.JavaClass;
+import com.thoughtworks.qdox.model.JavaMethod;
+import com.thoughtworks.qdox.model.JavaParameter;
+import com.thoughtworks.qdox.model.Type;
+
+/**
+ * Finds EventProducer interfaces and builds the event model for them.
+ */
+public class EventProducerCollector {
+
+    private static final String CLASSNAME_EVENT_PRODUCER = EventProducer.class.getName();
+    private static final Map PRIMITIVE_MAP;
+    
+    static {
+        Map m = new java.util.HashMap();
+        m.put("boolean", Boolean.class);
+        m.put("byte", Byte.class);
+        m.put("char", Character.class);
+        m.put("short", Short.class);
+        m.put("int", Integer.class);
+        m.put("long", Long.class);
+        m.put("float", Float.class);
+        m.put("double", Double.class);
+        PRIMITIVE_MAP = Collections.unmodifiableMap(m);
+    }
+    
+    private DocletTagFactory tagFactory;
+    private EventModel model = new EventModel();
+
+    public EventProducerCollector() {
+        this.tagFactory = createDocletTagFactory();
+    }
+
+    protected DocletTagFactory createDocletTagFactory() {
+        return new DefaultDocletTagFactory();
+    }
+
+    public void scanFile(File src, String filename)
+            throws IOException, EventConventionException, ClassNotFoundException {
+        JavaDocBuilder builder = new JavaDocBuilder(this.tagFactory);
+        builder.addSource(src);
+        JavaClass[] classes = builder.getClasses();
+        for (int i = 0, c = classes.length; i < c; i++) {
+            JavaClass clazz = classes[i];
+            if (clazz.isInterface() && implementsInterface(clazz, CLASSNAME_EVENT_PRODUCER)) {
+                processEventProducerInterface(clazz, filename);
+            }
+        }
+    }
+
+    private boolean implementsInterface(JavaClass clazz, String intf) {
+        JavaClass[] classes = clazz.getImplementedInterfaces();
+        for (int i = 0, c = classes.length; i < c; i++) {
+            JavaClass cl = classes[i];
+            if (cl.getFullyQualifiedName().equals(intf)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Processes an EventProducer interface and creates an EventProducerModel from it.
+     * @param clazz the EventProducer interface
+     * @param javaFilename the filename of the Java source of the interface
+     * @throws EventConventionException if the event producer conventions are violated
+     * @throws ClassNotFoundException if a required class cannot be found
+     */
+    protected void processEventProducerInterface(JavaClass clazz, String javaFilename)
+                throws EventConventionException, ClassNotFoundException {
+        EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName());
+        JavaMethod[] methods = clazz.getMethods(true);
+        for (int i = 0, c = methods.length; i < c; i++) {
+            JavaMethod method = methods[i];
+            EventMethodModel methodMeta = createMethodModel(method);
+            prodMeta.addMethod(methodMeta);
+        }
+        this.model.addProducer(prodMeta);
+    }
+
+    private EventMethodModel createMethodModel(JavaMethod method)
+            throws EventConventionException, ClassNotFoundException {
+        JavaClass clazz = method.getParentClass();
+        //Check EventProducer conventions
+        if (!method.getReturns().isVoid()) {
+            throw new EventConventionException("All methods of interface "
+                    + clazz.getFullyQualifiedName() + " must have return type 'void'!");
+        }
+        String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature();
+        JavaParameter[] params = method.getParameters();
+        if (params.length < 1) {
+            throw new EventConventionException("The method " + methodSig
+                    + " must have at least one parameter: 'Object source'!");
+        }
+        Type firstType = params[0].getType();
+        if (firstType.isPrimitive() || !"source".equals(params[0].getName())) {
+            throw new EventConventionException("The first parameter of the method " + methodSig
+                    + " must be: 'Object source'!");
+        }
+        
+        //build method model
+        DocletTag tag = method.getTagByName("event.severity");
+        EventSeverity severity;
+        if (tag != null) {
+            severity = EventSeverity.valueOf(tag.getValue());
+        } else { 
+            severity = EventSeverity.INFO;
+        }
+        EventMethodModel methodMeta = new EventMethodModel(
+                method.getName(), severity);
+        if (params.length > 1) {
+            for (int j = 1, cj = params.length; j < cj; j++) {
+                JavaParameter p = params[j];
+                Class type;
+                JavaClass pClass = p.getType().getJavaClass();
+                if (p.getType().isPrimitive()) {
+                    type = (Class)PRIMITIVE_MAP.get(pClass.getName());
+                    if (type == null) {
+                        throw new UnsupportedOperationException(
+                                "Primitive datatype not supported: " + pClass.getName());
+                    }
+                } else {
+                    String className = pClass.getFullyQualifiedName();
+                    type = Class.forName(className);
+                }
+                methodMeta.addParameter(type, p.getName());
+            }
+        }
+        Type[] exceptions = method.getExceptions();
+        if (exceptions != null && exceptions.length > 0) {
+            //We only use the first declared exception because that is always thrown
+            JavaClass cl = exceptions[0].getJavaClass();
+            methodMeta.setExceptionClass(cl.getFullyQualifiedName());
+            methodMeta.setSeverity(EventSeverity.FATAL); //In case it's not set in the comments
+        }
+        return methodMeta;
+    }
+
+    public EventModel getModel() {
+        return this.model;
+    }
+    
+    public void saveModelToXML(File modelFile) throws IOException {
+        getModel().saveToXML(modelFile);
+    }
+    
+}
diff --git a/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java b/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
new file mode 100644
index 000000000..755e3da0b
--- /dev/null
+++ b/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
@@ -0,0 +1,200 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.tools;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXTransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.w3c.dom.Node;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.selectors.FilenameSelector;
+
+public class EventProducerCollectorTask extends Task {
+
+    private List filesets = new java.util.ArrayList();
+    private File modelFile;
+    private File translationFile;
+    
+    /** {@inheritDoc} */
+    public void execute() throws BuildException {
+        try {
+            EventProducerCollector collector = new EventProducerCollector();
+            processFileSets(collector);
+            getModelFile().getParentFile().mkdirs();
+            collector.saveModelToXML(getModelFile());
+            log("Event model written to " + getModelFile());
+            if (getTranslationFile() != null) {
+                updateTranslationFile();
+            }
+        } catch (ClassNotFoundException e) {
+            throw new BuildException(e);
+        } catch (EventConventionException ece) {
+            throw new BuildException(ece);
+        } catch (IOException ioe) {
+            throw new BuildException(ioe);
+        }
+    }
+    
+    private static final String MODEL2TRANSLATION = "model2translation.xsl";
+    private static final String MERGETRANSLATION = "merge-translation.xsl";
+    
+    protected void updateTranslationFile() throws IOException {
+        try {
+            boolean resultExists = getTranslationFile().exists();
+            SAXTransformerFactory tFactory
+                = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
+            
+            //Generate fresh generated translation file as template
+            Source src = new StreamSource(getModelFile());
+            StreamSource xslt1 = new StreamSource(
+                    getClass().getResourceAsStream(MODEL2TRANSLATION));
+            if (xslt1.getInputStream() == null) {
+                throw new FileNotFoundException(MODEL2TRANSLATION + " not found");
+            }
+            DOMResult domres = new DOMResult();
+            Transformer transformer = tFactory.newTransformer(xslt1);
+            transformer.transform(src, domres);
+            final Node generated = domres.getNode();
+            
+            Node sourceDocument;
+            if (resultExists) {
+                //Load existing translation file into memory (because we overwrite it later)
+                src = new StreamSource(getTranslationFile());
+                domres = new DOMResult();
+                transformer = tFactory.newTransformer();
+                transformer.transform(src, domres);
+                sourceDocument = domres.getNode();
+            } else {
+                //Simply use generated as source document
+                sourceDocument = generated;
+            }
+
+            //Generate translation file (with potentially new translations)
+            src = new DOMSource(sourceDocument);
+            Result res = new StreamResult(getTranslationFile());
+            StreamSource xslt2 = new StreamSource(
+                    getClass().getResourceAsStream(MERGETRANSLATION));
+            if (xslt2.getInputStream() == null) {
+                throw new FileNotFoundException(MERGETRANSLATION + " not found");
+            }
+            transformer = tFactory.newTransformer(xslt2);
+            transformer.setURIResolver(new URIResolver() {
+                public Source resolve(String href, String base) throws TransformerException {
+                    if ("my:dom".equals(href)) {
+                        return new DOMSource(generated);
+                    }
+                    return null;
+                }
+            });
+            if (resultExists) {
+                transformer.setParameter("generated-url", "my:dom");
+            }
+            transformer.transform(src, res);
+            if (resultExists) {
+                log("Translation file updated: " + getTranslationFile());
+            } else {
+                log("Translation file generated: " + getTranslationFile());
+            }
+        } catch (TransformerException te) {
+            throw new IOException(te.getMessage());
+        }
+    }
+
+    protected void processFileSets(EventProducerCollector collector)
+            throws IOException, EventConventionException, ClassNotFoundException {
+        Iterator iter = filesets.iterator();
+        while (iter.hasNext()) {
+            FileSet fs = (FileSet)iter.next();
+            DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+            String[] srcFiles = ds.getIncludedFiles();
+            File directory = fs.getDir(getProject());
+            for (int i = 0, c = srcFiles.length; i < c; i++) {
+                String filename = srcFiles[i];
+                File src = new File(directory, filename);
+                collector.scanFile(src, filename);
+            }
+        }
+    }
+
+    public void addFileset(FileSet set) {
+        filesets.add(set);
+    }
+    
+    public void setModelFile(File f) {
+        this.modelFile = f;
+    }
+    
+    public File getModelFile() {
+        return this.modelFile;
+    }
+    
+    public void setTranslationFile(File f) {
+        this.translationFile = f;
+    }
+    
+    public File getTranslationFile() {
+        return this.translationFile;
+    }
+    
+    public static void main(String[] args) {
+        try {
+            Project project = new Project();
+
+            EventProducerCollectorTask generator = new EventProducerCollectorTask();
+            generator.setProject(project);
+            project.setName("Test");
+            FileSet fileset = new FileSet();
+            fileset.setDir(new File("test/java"));
+            
+            FilenameSelector selector = new FilenameSelector();
+            selector.setName("**/*.java");
+            fileset.add(selector);
+            generator.addFileset(fileset);
+            
+            File targetDir = new File("build/codegen1");
+            targetDir.mkdirs();
+            
+            generator.setModelFile(new File("D:/out.xml"));
+            generator.setTranslationFile(new File("D:/out1.xml"));
+            generator.execute();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/codegen/java/org/apache/fop/tools/merge-translation.xsl b/src/codegen/java/org/apache/fop/tools/merge-translation.xsl
new file mode 100644
index 000000000..d15d22fd3
--- /dev/null
+++ b/src/codegen/java/org/apache/fop/tools/merge-translation.xsl
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
+
+  <xsl:param name="generated-url" select="''"/>
+  
+  <xsl:template match="catalogue">
+    <catalogue>
+      <xsl:attribute name="xml:lang"><xsl:value-of select="@xml:lang"/></xsl:attribute>
+      <xsl:apply-templates/>
+      <xsl:if test="$generated-url != ''">
+        <xsl:variable name="generated" select="document($generated-url)"/>
+        <xsl:call-template name="add-new-messages">
+          <xsl:with-param name="existing" select="."/>
+          <xsl:with-param name="new" select="$generated/catalogue"/>
+        </xsl:call-template>
+      </xsl:if>
+    </catalogue>
+  </xsl:template>
+  
+  <xsl:template name="add-new-messages">
+    <xsl:param name="existing"/>
+    <xsl:param name="new"/>
+    <xsl:for-each select="$new/message">
+      <xsl:variable name="k" select="@key"/>
+      <xsl:if test="not(boolean($existing/message[@key = $k]))">
+        <xsl:apply-templates select="."></xsl:apply-templates>
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>  
+  
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/codegen/java/org/apache/fop/tools/model2translation.xsl b/src/codegen/java/org/apache/fop/tools/model2translation.xsl
new file mode 100644
index 000000000..a1cf404ee
--- /dev/null
+++ b/src/codegen/java/org/apache/fop/tools/model2translation.xsl
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+  <xsl:output indent="yes" method="xml" encoding="UTF-8"/>
+
+  <xsl:template match="event-model">
+    <catalogue>
+      <xsl:attribute name="xml:lang">en</xsl:attribute>
+      <xsl:apply-templates select="//method"></xsl:apply-templates>
+    </catalogue>
+  </xsl:template>
+  
+  <xsl:template match="method">
+    <message>
+      <xsl:attribute name="key"><xsl:value-of select="../@name"/>.<xsl:value-of select="@name"/></xsl:attribute>
+    </message>
+  </xsl:template>
+  
+</xsl:stylesheet>