Slight modification to user config file format

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

diff --git a/conf/fop.xconf b/conf/fop.xconf
index d3fc5794b8454e168f32b780fd57dbc64491429d..c5534b134a16cf2c73809357756a376796312f93 100644 (file)
--- a/conf/fop.xconf
+++ b/conf/fop.xconf
@@ -14,16 +14,16 @@ the location of this file.
 <!-- NOTE: This is the version of the configuration -->
 <fop version="1.0">
 
-  <userAgent>
-    <base url="./"/>
-    <!-- pixel to millimeter to specify dpi, 72dpi -->
-    <pixelToMillimeter value="0.35277777777777777778"/>
-    <!-- default page-height and page-width, in case
-         value is specified as auto -->
+  <base url="./"/>
+  <!-- pixel to millimeter to specify dpi, 72dpi -->
+  <pixelToMillimeter value="0.35277777777777777778"/>
+  <pagesettings>
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
     <pageHeight value="11in"/>
     <pageWidth value="8.26in"/>
-  </userAgent>
-
+  </pagesettings>
+  
   <!-- Information for specific renderers -->
   <!-- Uses renderer mime type for renderers -->
   <renderers>

diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java
index 6c278428aaf4478ebaec0f1c07041c382d1d67fe..b462bc58c79bbddd4ef3db7e7ac858a6f10e564e 100644 (file)
--- a/src/java/org/apache/fop/apps/FOUserAgent.java
+++ b/src/java/org/apache/fop/apps/FOUserAgent.java
@@ -353,10 +353,9 @@ public class FOUserAgent {
      */
     public void initUserConfig() throws ConfigurationException {
         log.info("Initializing User Agent Configuration");
-        Configuration cfgUserAgent = userConfig.getChild("userAgent");
-        if (cfgUserAgent.getChild("base", false) != null) {
+        if (userConfig.getChild("base", false) != null) {
             try {
-                String cfgBaseDir = cfgUserAgent.getChild("base")
+                String cfgBaseDir = userConfig.getChild("base")
                                     .getAttribute("url");
                 File dir = new File(cfgBaseDir);
                 if (dir.isDirectory()) {
@@ -372,18 +371,19 @@ public class FOUserAgent {
             }
             log.info("Base URL set to: " + baseURL);
         }
-        if (cfgUserAgent.getChild("pixelToMillimeter", false) != null) {
-            this.px2mm = cfgUserAgent.getChild("pixelToMillimeter")
+        if (userConfig.getChild("pixelToMillimeter", false) != null) {
+            this.px2mm = userConfig.getChild("pixelToMillimeter")
                             .getAttributeAsFloat("value", DEFAULT_PX2MM);
             log.info("pixelToMillimeter set to: " + px2mm);
         }
-        if (cfgUserAgent.getChild("pageHeight", false) != null) {
-            setPageHeight(cfgUserAgent.getChild("pageHeight")
+        Configuration pageConfig = userConfig.getChild("pagesettings");
+        if (pageConfig.getChild("pageHeight", false) != null) {
+            setPageHeight(pageConfig.getChild("pageHeight")
                             .getAttribute("value"));
             log.info("Default page-height set to: " + pageHeight);
         }
-        if (cfgUserAgent.getChild("pageWidth", false) != null) {
-            setPageWidth(cfgUserAgent.getChild("pageWidth")
+        if (pageConfig.getChild("pageWidth", false) != null) {
+            setPageWidth(pageConfig.getChild("pageWidth")
                             .getAttribute("value"));
             log.info("Default page-width set to: " + pageWidth);
         }