Author: acumiskey
Date: Wed Aug 27 06:08:49 2008
New Revision: 689472
URL: http://svn.apache.org/viewvc?rev=689472&view=rev
Log:
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.
........
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/java/org/apache/fop/UtilityCodeTestSuite.java
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 27 06:08:49 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-689001
+/xmlgraphics/fop/trunk:1-689471
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml?rev=689472&r1=689471&r2=689472&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/events/EventFormatter.xml
Wed Aug 27 06:08:49 2008
@@ -51,7 +51,7 @@
<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>
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=689472&r1=689471&r2=689472&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/java/org/apache/fop/UtilityCodeTestSuite.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/test/java/org/apache/fop/UtilityCodeTestSuite.java
Wed Aug 27 06:08:49 2008
@@ -50,6 +50,7 @@
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]