Author: mehdi
Date: Thu Jul 5 09:22:26 2012
New Revision: 1357517
URL: http://svn.apache.org/viewvc?rev=1357517&view=rev
Log:
Command line parameters override fop conf settings when set (they won't
override when not set)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1357517&r1=1357516&r2=1357517&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
Thu Jul 5 09:22:26 2012
@@ -1040,6 +1040,12 @@ public class CommandLineOptions {
} catch (SAXException e) {
throw new FOPException(e);
}
+ if (!strictValidation) {
+ fopFactoryBuilder.setStrictFOValidation(strictValidation);
+ }
+ if (useComplexScriptFeatures) {
+
fopFactoryBuilder.setComplexScriptFeatures(useComplexScriptFeatures);
+ }
}
factory = fopFactoryBuilder.build();
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java?rev=1357517&r1=1357516&r2=1357517&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPEventProcessingTestCase.java
Thu Jul 5 09:22:26 2012
@@ -26,6 +26,7 @@ import org.junit.Test;
import org.apache.xmlgraphics.util.MimeConstants;
+import org.apache.fop.apps.FOPException;
import org.apache.fop.events.EventProcessingTestCase;
@@ -49,12 +50,12 @@ public class AFPEventProcessingTestCase
testInvalidConfigEvent("afp-font-missing.xconf", ".fontConfigMissing");
}
- @Test
+ @Test(expected = FOPException.class)
public void testInvalidCharactersetName() throws Exception {
testInvalidConfigEvent("afp-invalid-characterset.xconf",
".characterSetNameInvalid");
}
- @Test
+ @Test(expected = FOPException.class)
public void testinvalidConfig() throws Exception {
testInvalidConfigEvent("afp-invalid-config.xconf",
".invalidConfiguration");
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java?rev=1357517&r1=1357516&r2=1357517&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/apps/FopConfParserTestCase.java
Thu Jul 5 09:22:26 2012
@@ -77,7 +77,7 @@ public class FopConfParserTestCase {
@Test
public void testStrictUserConfigValidation() {
builder.setStrictValidation(false);
- assertFalse(buildFactory().validateUserConfigStrictly());
+ assertFalse(buildFactory().validateStrictly());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
