Author: vhennebert
Date: Fri Mar 23 17:38:56 2012
New Revision: 1304524
URL: http://svn.apache.org/viewvc?rev=1304524&view=rev
Log:
Removed reference to XML schema from IF schema.
Copied the definition of xml:space into the IF schema.
Removed the setup-xml-schema Ant ask.
xml.xsd is a file under the W3C Document License and we cannot (yet?)
redistribute files under such a license.
Removed:
xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/xml.xsd
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/XMLSchemaResolver.java
Modified:
xmlgraphics/fop/trunk/build.xml
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/AbstractIFTest.java
Modified: xmlgraphics/fop/trunk/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1304524&r1=1304523&r2=1304524&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Fri Mar 23 17:38:56 2012
@@ -806,7 +806,8 @@ list of possible build targets.
</junit>
</sequential>
</macrodef>
- <target name="junit-all" depends="junit-compile, junit-transcoder,
junit-layout-hyphenation, setup-xml-schema" description="Runs FOP's JUnit basic
tests" if="junit.present">
+ <target name="junit-all" depends="junit-compile, junit-transcoder,
junit-layout-hyphenation"
+ description="Runs FOP's JUnit basic tests" if="junit.present">
<junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}"
forkmode="once"
errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
<sysproperty key="jawa.awt.headless" value="true"/>
@@ -844,25 +845,13 @@ list of possible build targets.
<target name="junit-area-tree-xml-format" depends="junit-compile"
description="Runs FOP's area tree XML format JUnit tests" if="xmlunit.present">
<junit-run title="area tree XML format"
testsuite="org.apache.fop.intermediate.AreaTreeXMLFormatTestSuite"
outfile="TEST-area-tree-xml-format"/>
</target>
- <target name="junit-intermediate-layout"
depends="junit-compile,setup-xml-schema"
- if="xmlunit.present">
+ <target name="junit-intermediate-layout" depends="junit-compile"
if="xmlunit.present">
<junit-run title="intermediate format from layout tests"
testsuite="org.apache.fop.intermediate.LayoutIFTestSuite"
outfile="TEST-intermediate-format-from-layout"/>
</target>
- <target name="setup-xml-schema">
- <local name="cache-dir"/>
- <property name="cache-dir" value="${basedir}/.cache/junit/intermediate"/>
- <mkdir dir="${cache-dir}"/>
- <get src="http://www.w3.org/2001/xml.xsd";
- dest="${cache-dir}/xml.xsd"
- usetimestamp="true"/>
- <copy file="${cache-dir}/xml.xsd"
- todir="${build.dir}/test-classes/org/apache/fop/intermediate"/>
- </target>
- <target name="junit-intermediate-format"
- depends="junit-compile,setup-xml-schema,junit-intermediate-layout"
+ <target name="junit-intermediate-format"
depends="junit-compile,junit-intermediate-layout"
description="Runs FOP's intermediate format JUnit tests"
if="xmlunit.present">
<junit-run title="intermediate format"
testsuite="org.apache.fop.intermediate.IntermediateFormatTestSuite"
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=1304524&r1=1304523&r2=1304524&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
Fri Mar 23 17:38:56 2012
@@ -138,4 +138,22 @@
<xs:attributeGroup name="foreignAtts">
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:attributeGroup>
+ <xs:attribute name="xmlSpace">
+ <!--
+ This is a copy of the definition of the xml:space attribute, from the
schema for the XML
+ namespace. That schema can be found at http://www.w3.org/2001/xml.xsd.
+
+ Ideally we would want to re-use that schema. However, we donât want to
refer to it using an
+ import statement is it causes too many connections to the W3C website.
Neither can we store a
+ local copy and ship it with FOP as its license is the W3C Document License
and so far we are not
+ allowed to redistribute files under such a license.
+ See also https://issues.apache.org/jira/browse/LEGAL-111
+ -->
+ <xs:simpleType>
+ <xs:restriction base="xs:NCName">
+ <xs:enumeration value="default"/>
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:schema>
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=1304524&r1=1304523&r2=1304524&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
Fri Mar 23 17:38:56 2012
@@ -20,8 +20,6 @@
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="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"/>
@@ -70,7 +68,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:attribute ref="mf:xmlSpace"/>
<xs:attributeGroup ref="mf:foreignAtts"/>
</xs:complexType>
</xs:element>
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java?rev=1304524&r1=1304523&r2=1304524&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
Fri Mar 23 17:38:56 2012
@@ -71,7 +71,6 @@ abstract class AbstractIFTest extends Ab
}
});
- sFactory.setResourceResolver(XMLSchemaResolver.getInstance());
File ifSchemaFile = new File(
"src/documentation/intermediate-format-ng/fop-intermediate-format-ng.xsd");
ifSchema = sFactory.newSchema(ifSchemaFile);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
