Menu
▾
▴
SF.net SVN: xmlunit:[524] trunk/xmlunit
|
From: <bo...@us...> - 2013-02-07 20:50:54
|
Revision: 524
http://xmlunit.svn.sourceforge.net/xmlunit/?rev=524&view=rev
Author: bodewig
Date: 2013-02-07 20:50:46 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
merge build and user-guide changes from 1.x branch
Modified Paths:
--------------
trunk/xmlunit/build.xml
trunk/xmlunit/docbook.xml
trunk/xmlunit/src/user-guide/XMLUnit-Java.xml
Property Changed:
----------------
trunk/xmlunit/build.xml
trunk/xmlunit/docbook.xml
trunk/xmlunit/src/user-guide/XMLUnit-Java.xml
Modified: trunk/xmlunit/build.xml
===================================================================
--- trunk/xmlunit/build.xml 2013-02-07 20:50:15 UTC (rev 523)
+++ trunk/xmlunit/build.xml 2013-02-07 20:50:46 UTC (rev 524)
@@ -227,7 +227,6 @@
<fileset dir="${src.dir}/etc">
<include name="xmlunit.pom"/>
<include name="xmlunit-ivy.xml"/>
- <include name="xmlunit-maven-metadata.xml"/>
</fileset>
<mapper type="glob" from="xmlunit*" to="xmlunit-${xmlunit.version}*"/>
<filterset>
@@ -276,6 +275,12 @@
<target name="dist"
depends="clean,bindist,srcdist,compile-userguide-examples"
description="creates the distribution files">
+ <jar jarfile="${lib.dir}/xmlunit-${xmlunit.version}-sources.jar"
+ basedir="${src.dir}/java"
+ />
+ <jar jarfile="${lib.dir}/xmlunit-${xmlunit.version}-javadoc.jar"
+ basedir="${docs.dir}/api"
+ />
<checksum algorithm="md5">
<fileset dir="${dist.dir}">
<include name="*.zip"/>
@@ -286,6 +291,14 @@
<include name="*.zip"/>
</fileset>
</checksum>
+ <checksum algorithm="md5">
+ <fileset dir="${lib.dir}"/>
+ </checksum>
+ <checksum algorithm="sha1">
+ <fileset dir="${lib.dir}">
+ <exclude name="*.md5"/>
+ </fileset>
+ </checksum>
</target>
<target name="compile-userguide-examples" depends="compile">
Property changes on: trunk/xmlunit/build.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/xmlunit-1.x/build.xml:355,521-522
Modified: trunk/xmlunit/docbook.xml
===================================================================
--- trunk/xmlunit/docbook.xml 2013-02-07 20:50:15 UTC (rev 523)
+++ trunk/xmlunit/docbook.xml 2013-02-07 20:50:46 UTC (rev 524)
@@ -1,3 +1,35 @@
+<!--
+Copyright (c) 2001-2013, Jeff Martin, Tim Bacon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the xmlunit.sourceforge.net nor the names
+ of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
<project>
<!-- allow overrides -->
<property file="docbook.properties"/>
@@ -5,6 +37,7 @@
<!-- location of Docbook Stylesheets and dblatex -->
<property name="db5.xsl" location="../../docbook/docbook5-xsl-1.72.0"/>
<property name="dblatex" value="/usr/bin/dblatex"/>
+ <property name="xsltproc" value="/usr/bin/xsltproc"/>
<property name="html.dir" location="${userguide.docs.dir}/html"/>
<property name="user.guide" value="XMLUnit-Java"/>
@@ -20,11 +53,36 @@
targetfile="${html.dir}/index.html"/>
</target>
- <target name="users-guide-html" depends="-html-needs-refresh?"
- unless="HTML is up-to-date"
- description="Creates HTML version of the User's Guide">
+ <target name="-xsltproc-available?" depends="-html-needs-refresh?">
+ <available property="xsltproc available"
+ file="${xsltproc}"/>
+ <condition property="run TraX">
+ <not>
+ <or>
+ <isset property="xsltproc available"/>
+ <isset property="HTML is up-to-date"/>
+ </or>
+ </not>
+ </condition>
+ <condition property="run xsltproc">
+ <and>
+ <isset property="xsltproc available"/>
+ <not>
+ <isset property="HTML is up-to-date"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="-users-guide-html-pre" depends="-html-needs-refresh?"
+ unless="HTML is up-to-date">
<delete dir="${html.dir}" quiet="true"/>
<mkdir dir="${html.dir}"/>
+ </target>
+
+ <target name="-users-guide-html-trax"
+ depends="-xsltproc-available?,-users-guide-html-pre"
+ if="run TraX">
<xslt
basedir="${src.userguide.dir}"
destdir="${html.dir}"
@@ -34,10 +92,33 @@
<param name="section.autolabel" expression="1"/>
<param name="section.label.includes.component.label" expression="1"/>
</xslt>
- <copy file="${src.dir}/site/xmlunit.png" toDir="${html.dir}"/>
<delete file="${html.dir}/${user.guide}.html" quiet="true"/>
</target>
+ <target name="-users-guide-html-xsltproc"
+ depends="-xsltproc-available?,-users-guide-html-pre"
+ if="run xsltproc">
+ <exec executable="${xsltproc}" failonerror="true">
+ <arg value="-o"/>
+ <!-- xsltproc needs the trailing slash to work properly -->
+ <arg value="${html.dir}/"/>
+ <arg value="--param"/>
+ <arg value="section.autolabel"/>
+ <arg value="1"/>
+ <arg value="--param"/>
+ <arg value="section.label.includes.component.label"/>
+ <arg value="1"/>
+ <arg file="${db5.xsl}/html/chunk.xsl"/>
+ <arg file="${src.userguide.dir}/${user.guide}.xml"/>
+ </exec>
+ </target>
+
+ <target name="users-guide-html"
+ depends="-users-guide-html-trax,-users-guide-html-xsltproc"
+ unless="HTML is up-to-date"
+ description="Creates HTML version of the User's Guide">
+ </target>
+
<target name="-check-os">
<condition property="isWindows">
<os family="windows"/>
Property changes on: trunk/xmlunit/docbook.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/xmlunit-1.x/docbook.xml:355,513-517
Modified: trunk/xmlunit/src/user-guide/XMLUnit-Java.xml
===================================================================
--- trunk/xmlunit/src/user-guide/XMLUnit-Java.xml 2013-02-07 20:50:15 UTC (rev 523)
+++ trunk/xmlunit/src/user-guide/XMLUnit-Java.xml 2013-02-07 20:50:46 UTC (rev 524)
@@ -1,13 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1b1//EN" "http://docbook.org/xml/simple/1.1b1/sdocbook.dtd">
+<!--
+Copyright (c) 2001-2013, Jeff Martin, Tim Bacon
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+ * Neither the name of the xmlunit.sourceforge.net nor the names
+ of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written
+ permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+-->
+
<article>
- <title>XMLUnit Java User's Guide
- <inlinemediaobject><imageobject>
- <imagedata fileref="xmlunit.png" width="331" depth="100"
- valign="middle" format="PNG"/>
- </imageobject></inlinemediaobject>
- </title>
+ <title>XMLUnit Java User's Guide</title>
<articleinfo>
<authorgroup>
<author>
@@ -44,6 +71,11 @@
<date>September 2009</date>
<revremark>Documentation for XMLUnit Java 1.3</revremark>
</revision>
+ <revision>
+ <revnumber>1.4</revnumber>
+ <date>February 2013</date>
+ <revremark>Documentation for XMLUnit Java 1.4</revremark>
+ </revision>
</revhistory>
</articleinfo>
@@ -2830,8 +2862,10 @@
(<literal>String</literal>) prefixes as keys and
(<literal>String</literal>) namespace URIs as values.</para>
- <para>The empty string is used as prefix for the default
- namespace of a document.</para>
+ <para>Note there is nothing like a default namespace in XPath
+ selectors. If you are using namespaces in your XPath, all
+ namespaces need a prefix (of length greater than zero). This
+ is independent of the prefixes used in your document.</para>
<para>The following example is taken from XMLUnit's own tests.
It demonstrates that the namespace prefix of the document under
@@ -3618,7 +3652,7 @@
<section id="Changes 1.4">
<title>Changes from XMLUnit 1.3 to 1.4</title>
- <section id="Breaking Changes 1.3">
+ <section id="Breaking Changes 1.4">
<title>Breaking Changes</title>
<!--itemizedlist>
@@ -3628,8 +3662,14 @@
<section id="New Features 1.4">
<title>New Features</title>
- <!--itemizedlist>
- </itemizedlist-->
+ <itemizedlist>
+ <listitem>
+ xsi:type attributes now have their value interpreted as a
+ QName and will compare as identical if their namespace URI
+ and local names match even if they use different
+ prefixes. <ulink url="https://sourceforge.net/tracker/?func=detail&aid=3602981&group_id=23187&atid=377771">Issue 3602981</ulink>
+ </listitem>
+ </itemizedlist>
</section>
<section id="Bugfixes 1.4">
@@ -3639,9 +3679,18 @@
<listitem>
<literal>XMLTestCase</literal>'s and <literal>XMLAssert</literal>'s
<literal>assertXpathsEqual</literal> methods threw an
- exception at least one XPath matched an attribute. <ulink
+ exception when at least one XPath matched an attribute. <ulink
url="https://sourceforge.net/tracker/?func=detail&aid=3290264&group_id=23187&atid=377768">Issue 377768</ulink>.
</listitem>
+
+ <listitem>
+ <literal>FloatingPointTolerantDifferenceListener</literal>
+ expected numbers to differ by less than the given
+ tolerance rather than "less or equal" than as the docs said.
+ <ulink
+ href="https://sourceforge.net/tracker/index.php?func=detail&aid=3593368&group_id=23187&atid=377768">Issue
+ 3593368</ulink>
+ </listitem>
</itemizedlist>
</section>
</section>
Property changes on: trunk/xmlunit/src/user-guide/XMLUnit-Java.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/xmlunit-1.x/src/user-guide/XMLUnit-Java.xml:346,355,494,497-517
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
