From: Adrian Cumiskey <acumiskey@apache.org>
Date: Wed, 27 Aug 2008 13:08:49 +0000 (+0000)
Subject: Merged revisions 689043,689442 via svnmerge from
X-Git-Tag: fop-1_0~376^2~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b550f664cfc36faa8baf468ce96199509a2bfc01;p=xmlgraphics-fop.git

Merged revisions 689043,689442 via svnmerge from
https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r689043 | maxberger | 2008-08-26 13:08:57 +0100 (Tue, 26 Aug 2008) | 1 line

  added URIResolutionTestCase
........
  r689442 | lfurini | 2008-08-27 11:48:54 +0100 (Wed, 27 Aug 2008) | 1 line

  Expanded warning message about borders and paddings on regions.
........


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

diff --git a/src/java/org/apache/fop/events/EventFormatter.xml b/src/java/org/apache/fop/events/EventFormatter.xml
index 3578dc4e6..be8f028dc 100644
--- a/src/java/org/apache/fop/events/EventFormatter.xml
+++ b/src/java/org/apache/fop/events/EventFormatter.xml
@@ -51,7 +51,7 @@ Any reference to it will be considered a reference to the first occurrence in th
   <message key="org.apache.fop.fo.FOValidationEventProducer.flowNameNotMapped">The flow-name "{flowName}" on {elementName} could not be mapped to a region-name in the layout-master-set.{{locator}}</message>
   <message key="org.apache.fop.fo.FOValidationEventProducer.masterNotFound">The master-reference "{masterReference}" on {elementName} matches no simple-page-master or page-sequence-master.{{locator}}</message>
   <message key="org.apache.fop.fo.FOValidationEventProducer.illegalRegionName">The region-name "{regionName}" for {elementName} is not permitted.{{locator}}</message>
-  <message key="org.apache.fop.fo.FOValidationEventProducer.nonZeroBorderPaddingOnRegion">Border and padding for {elementName} "{regionName}" must be '0' (See 6.4.13 in XSL 1.0).{{locator}}</message>
+  <message key="org.apache.fop.fo.FOValidationEventProducer.nonZeroBorderPaddingOnRegion">Border and padding for {elementName} "{regionName}" should be '0' (See 6.4.14 in XSL 1.1); non-standard values are allowed if relaxed validation is enabled. {{locator}}</message>
   <message key="org.apache.fop.fo.FOValidationEventProducer.columnCountErrorOnRegionBodyOverflowScroll">If overflow property is set to "scroll" on {elementName}, a column-count other than "1" may not be specified.{{locator}}</message>
   <message key="org.apache.fop.fo.FOValidationEventProducer.invalidFORoot">First element must be the fo:root formatting object. Found {elementName} instead. Please make sure you're producing a valid XSL-FO document.</message>
   <message key="org.apache.fop.fo.FOValidationEventProducer.emptyDocument">Document is empty (something might be wrong with your XSLT stylesheet).</message>
diff --git a/test/java/org/apache/fop/UtilityCodeTestSuite.java b/test/java/org/apache/fop/UtilityCodeTestSuite.java
index a073c4988..fed9f0f71 100644
--- a/test/java/org/apache/fop/UtilityCodeTestSuite.java
+++ b/test/java/org/apache/fop/UtilityCodeTestSuite.java
@@ -50,6 +50,7 @@ public class UtilityCodeTestSuite {
         suite.addTest(new TestSuite(ElementListUtilsTestCase.class));
         suite.addTest(new TestSuite(BasicEventTestCase.class));
         suite.addTest(new TestSuite(XMLResourceBundleTestCase.class));
+        suite.addTest(new TestSuite(URIResolutionTestCase.class));
         //$JUnit-END$
         return suite;
     }