git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@420543 13f79535-47bb-0310-9956-ffa450edef68tags/fop-0_93
@@ -127,13 +127,8 @@ public class FOUserAgent { | |||
throw new NullPointerException("The factory parameter must not be null"); | |||
} | |||
this.factory = factory; | |||
try { | |||
if (factory.getUserConfig() != null) { | |||
configure(factory.getUserConfig()); | |||
} | |||
} catch (ConfigurationException cfge) { | |||
log.error("Error while initializing the user asgent: " | |||
+ cfge.getMessage()); | |||
if (factory.getUserConfig() != null) { | |||
configure(factory.getUserConfig()); | |||
} | |||
} | |||
@@ -287,7 +282,7 @@ public class FOUserAgent { | |||
* Configures the FOUserAgent through the factory's configuration. | |||
* @see org.apache.avalon.framework.configuration.Configurable | |||
*/ | |||
protected void configure(Configuration cfg) throws ConfigurationException { | |||
public void configure(Configuration cfg) { | |||
setBaseURL(FopFactory.getBaseURLfromConfig(cfg, "base")); | |||
if (cfg.getChild("target-resolution", false) != null) { | |||
this.targetResolution |
@@ -136,6 +136,9 @@ public class CommandLineOptions { | |||
} | |||
checkSettings(); | |||
createUserConfig(); | |||
if (factory.getUserConfig() != null) { | |||
foUserAgent.configure(factory.getUserConfig()); | |||
} | |||
addXSLTParameter("fop-output-format", getOutputFormat()); | |||
addXSLTParameter("fop-version", Version.getVersion()); | |||
} |
@@ -27,6 +27,10 @@ | |||
<changes> | |||
<release version="FOP Trunk"> | |||
<action context="Code" dev="MM" type="fix"> | |||
Bugfix: FOUserAgent specific configuration parameters specified in config file | |||
were not set when FOP was invoked from command line. | |||
</action> | |||
<action context="Code" dev="JM" type="add"> | |||
Added support for PDF/A-1b and PDF/X-3:2003. (Note: this may still be a bit | |||
incomplete. Feedback is welcome!) |