Add dynamic lookup of the RendererMakers to RendererFactory (as suggested by Nils...

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

diff --git a/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker b/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker
new file mode 100644 (file)
index 0000000..7a5cac9
--- /dev/null
+++ b/src/java/META-INF/services/org.apache.fop.render.AbstractRendererMaker
@@ -0,0 +1,9 @@
+org.apache.fop.render.pdf.PDFRendererMaker
+org.apache.fop.render.ps.PSRendererMaker
+org.apache.fop.render.txt.TXTRendererMaker
+org.apache.fop.render.bitmap.PNGRendererMaker
+org.apache.fop.render.bitmap.TIFFRendererMaker
+org.apache.fop.render.bitmap.TIFFRendererMaker
+org.apache.fop.render.xml.XMLRendererMaker
+org.apache.fop.render.awt.AWTRendererMaker
+org.apache.fop.render.print.PrintRendererMaker
\ No newline at end of file

diff --git a/src/java/org/apache/fop/render/RendererFactory.java b/src/java/org/apache/fop/render/RendererFactory.java
index c6ed0f6411ddddb2a4def8a894ba8a47b1271609..264d34edfb6c382190caf13186b7d9d46d97185f 100644 (file)
--- a/src/java/org/apache/fop/render/RendererFactory.java
+++ b/src/java/org/apache/fop/render/RendererFactory.java
@@ -62,15 +62,12 @@ public class RendererFactory {
     }
     
     private void registerStandardRenderers() {
-        addRendererMaker(new org.apache.fop.render.pdf.PDFRendererMaker());
-        addRendererMaker(new org.apache.fop.render.ps.PSRendererMaker());
-        addRendererMaker(new org.apache.fop.render.txt.TXTRendererMaker());
-        addRendererMaker(new org.apache.fop.render.bitmap.PNGRendererMaker());
-        addRendererMaker(new org.apache.fop.render.bitmap.TIFFRendererMaker());
-        addRendererMaker(new org.apache.fop.render.bitmap.TIFFRendererMaker());
-        addRendererMaker(new org.apache.fop.render.xml.XMLRendererMaker());
-        addRendererMaker(new org.apache.fop.render.awt.AWTRendererMaker());
-        addRendererMaker(new org.apache.fop.render.print.PrintRendererMaker());
+        Iterator rendererMakers = Service.providers(AbstractRendererMaker.class); 
+        if (rendererMakers != null) {
+            while (rendererMakers.hasNext()) {
+                addRendererMaker((String) rendererMakers.next());
+            }
+        }
     }
     
     private void registerStandardEventHandlers() {