|
 |
c12d0e |
Index: test/saxon.xsl
|
|
|
c12d0e |
===================================================================
|
|
|
c12d0e |
--- test/saxon.xsl (revision 2353)
|
|
|
c12d0e |
+++ test/saxon.xsl (working copy)
|
|
|
c12d0e |
@@ -1,8 +1,8 @@
|
|
|
c12d0e |
|
|
|
c12d0e |
-
|
|
|
c12d0e |
+
|
|
|
c12d0e |
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
|
|
c12d0e |
- xmlns:saxon="http://icl.com/saxon"
|
|
|
c12d0e |
- extension-element-prefixes="saxon">
|
|
|
c12d0e |
+ xmlns:xalan="http://xml.apache.org/xalan"
|
|
|
c12d0e |
+ extension-element-prefixes="xalan">
|
|
|
c12d0e |
|
|
|
c12d0e |
<xsl:output method="text"/>
|
|
|
c12d0e |
|
|
|
c12d0e |
@@ -10,21 +10,21 @@
|
|
|
c12d0e |
<xsl:variable name="prepped">
|
|
|
c12d0e |
<xsl:apply-templates select="*"/>
|
|
|
c12d0e |
</xsl:variable>
|
|
|
c12d0e |
- <xsl:apply-templates select="saxon:node-set($prepped)/documents/*" mode="output"/>
|
|
|
c12d0e |
+ <xsl:apply-templates select="xalan:nodeset($prepped)/documents/*" mode="output"/>
|
|
|
c12d0e |
</xsl:template>
|
|
|
c12d0e |
|
|
|
c12d0e |
<xsl:template match="document" mode="output">
|
|
|
c12d0e |
- <saxon:output href="{@href}" method="{@method}">
|
|
|
c12d0e |
+ <xsl:document href="{@href}" method="{@method}">
|
|
|
c12d0e |
<xsl:if test="@dtd">
|
|
|
c12d0e |
<xsl:value-of select="@dtd" disable-output-escaping="yes"/>
|
|
|
c12d0e |
</xsl:if>
|
|
|
c12d0e |
<xsl:copy-of select="node()"/>
|
|
|
c12d0e |
- </saxon:output>
|
|
|
c12d0e |
+ </xsl:document>
|
|
|
c12d0e |
</xsl:template>
|
|
|
c12d0e |
|
|
|
c12d0e |
<xsl:template match="dir" mode="output">
|
|
|
c12d0e |
|
|
|
c12d0e |
- xmlns:File="java:java.io.File"/>
|
|
|
c12d0e |
+ xmlns:File="xalan://java.io.File"/>
|
|
|
c12d0e |
</xsl:template>
|
|
|
c12d0e |
|
|
|
c12d0e |
</xsl:stylesheet>
|
|
|
c12d0e |
Index: mod/schematron/mod.xml
|
|
|
c12d0e |
===================================================================
|
|
|
c12d0e |
--- mod/schematron/mod.xml (revision 2353)
|
|
|
c12d0e |
+++ mod/schematron/mod.xml (working copy)
|
|
|
c12d0e |
@@ -27,7 +27,7 @@
|
|
|
c12d0e |
|
|
|
c12d0e |
in="mod/schematron/src/main/${mod.schematron.respackage}/schematron.xsl"
|
|
|
c12d0e |
out="${mod.schematron.resdir}/schematron-xsltc.xsl">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
</target>
|
|
|
c12d0e |
</ant>
|
|
|
c12d0e |
Index: mod/xsd-datatype/test/xsdtest.xml
|
|
|
c12d0e |
===================================================================
|
|
|
c12d0e |
--- mod/xsd-datatype/test/xsdtest.xml (revision 2353)
|
|
|
c12d0e |
+++ mod/xsd-datatype/test/xsdtest.xml (working copy)
|
|
|
c12d0e |
@@ -739,7 +739,9 @@
|
|
|
c12d0e |
<length value="0"></length>
|
|
|
c12d0e |
<length value="1">x</length>
|
|
|
c12d0e |
<length value="1"> x </length>
|
|
|
c12d0e |
+
|
|
|
c12d0e |
<length value="1">𐠀</length>
|
|
|
c12d0e |
+-->
|
|
|
c12d0e |
</datatype>
|
|
|
c12d0e |
<datatype name="language">
|
|
|
c12d0e |
<valid>en</valid>
|
|
|
c12d0e |
Index: build.xml
|
|
|
c12d0e |
===================================================================
|
|
|
c12d0e |
--- build.xml (revision 2353)
|
|
|
c12d0e |
+++ build.xml (working copy)
|
|
|
c12d0e |
@@ -40,7 +40,7 @@
|
|
|
c12d0e |
|
|
|
c12d0e |
<target name="modbuild" depends="modules,check-modbuild" unless="modbuild-ok">
|
|
|
c12d0e |
<xslt style="build.xsl" in="modules.xml" out="modbuild.xml" force="true">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
</target>
|
|
|
c12d0e |
|
|
|
c12d0e |
@@ -74,7 +74,7 @@
|
|
|
c12d0e |
includes="${moddir}/*/${modfile}"
|
|
|
c12d0e |
filedirparameter="name"
|
|
|
c12d0e |
destdir=".">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
|
|
|
c12d0e |
to="mod/\1/\1.iml"
|
|
|
c12d0e |
handledirsep="true"/>
|
|
|
c12d0e |
@@ -183,15 +183,15 @@
|
|
|
c12d0e |
<target name="jing-doc" depends="version">
|
|
|
c12d0e |
|
|
|
c12d0e |
style="doc/derivative.xsl">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
|
|
|
c12d0e |
style="doc/design.xsl">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
|
|
|
c12d0e |
style="doc/nrl.xsl">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
<copy todir="${build.dir}">
|
|
|
c12d0e |
<fileset dir="doc" includes="*.html"/>
|
|
|
c12d0e |
Index: build.xsl
|
|
|
c12d0e |
===================================================================
|
|
|
c12d0e |
--- build.xsl (revision 2353)
|
|
|
c12d0e |
+++ build.xsl (working copy)
|
|
|
c12d0e |
@@ -325,7 +325,7 @@
|
|
|
c12d0e |
|
|
|
c12d0e |
in="{$srctest}"
|
|
|
c12d0e |
out="{$runtestdir}/{@name}test.xml">
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
|
|
|
c12d0e |
</xsl:if>
|
|
|
c12d0e |
@@ -341,7 +341,7 @@
|
|
|
c12d0e |
</xsl:otherwise>
|
|
|
c12d0e |
</xsl:choose>
|
|
|
c12d0e |
</xsl:attribute>
|
|
|
c12d0e |
- <factory name="com.icl.saxon.TransformerFactoryImpl"/>
|
|
|
c12d0e |
+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
|
|
|
c12d0e |
<param name="dir" expression="{$runtestdir}"/>
|
|
|
c12d0e |
</xslt>
|
|
|
c12d0e |
</target>
|