Author: vhennebert
Date: Mon Nov 9 16:34:47 2009
New Revision: 834135
URL: http://svn.apache.org/viewvc?rev=834135&view=rev
Log:
Moved declaration of xml:space attribute from <text> to <page-sequence> in the
XML Schema, to reflect changes from rev. 834020.
Moved validation of intermediate XML to testParserToIntermediateFormat method,
so that any validation error is returned by Junit instead of being swallowed.
Modified:
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
Modified:
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd?rev=834135&r1=834134&r2=834135&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
(original)
+++
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng-content.xsd
Mon Nov 9 16:34:47 2009
@@ -20,8 +20,6 @@
targetNamespace="http://xmlgraphics.apache.org/fop/intermediate";
xmlns:mf="http://xmlgraphics.apache.org/fop/intermediate";>
<xs:include schemaLocation="fop-intermediate-format-ng-datatypes.xsd"/>
- <xs:import namespace="http://www.w3.org/XML/1998/namespace";
- schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<xs:complexType name="contentType">
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element name="viewport">
@@ -68,7 +66,6 @@
<xs:list itemType="mf:lengthType"/>
</xs:simpleType>
</xs:attribute>
- <xs:attribute ref="xml:space"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
Modified:
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd?rev=834135&r1=834134&r2=834135&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
(original)
+++
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd
Mon Nov 9 16:34:47 2009
@@ -20,6 +20,8 @@
targetNamespace="http://xmlgraphics.apache.org/fop/intermediate";
xmlns:mf="http://xmlgraphics.apache.org/fop/intermediate";
xmlns:nav="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace";
+ schemaLocation="http://www.w3.org/2001/xml.xsd"/>
<xs:import
namespace="http://xmlgraphics.apache.org/fop/intermediate/document-navigation";
schemaLocation="fop-intermediate-format-ng-nav.xsd"/>
<xs:import namespace="adobe:ns:meta/" schemaLocation="xmp-metadata.xsd"/>
@@ -61,6 +63,7 @@
<xs:element ref="mf:page" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute ref="xml:space"/>
<xs:attributeGroup ref="mf:foreignAtts"/>
</xs:complexType>
</xs:element>
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java?rev=834135&r1=834134&r2=834135&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
Mon Nov 9 16:34:47 2009
@@ -35,7 +35,6 @@
import org.custommonkey.xmlunit.XMLTestCase;
import org.w3c.dom.Document;
-
import org.xml.sax.SAXException;
import org.apache.commons.io.IOUtils;
@@ -95,7 +94,6 @@
env.saveDOM(intermediate, new File(outputDir,
getName() + ".1" + getIntermediateFileExtension()));
}
- validate(intermediate);
}
/** {...@inheritdoc} */
@@ -172,6 +170,7 @@
* @throws Exception if the test fails
*/
public void testParserToIntermediateFormat() throws Exception {
+ validate(intermediate);
Source src = new DOMSource(intermediate);
Document doc = parseAndRenderToIntermediateFormat(src);
if (outputDir != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
