Author: ltheussl Date: Wed May 20 07:53:34 2009 New Revision: 776605 URL: http://svn.apache.org/viewvc?rev=776605&view=rev Log: Undo some changes committed in r763762 that break compatibility with 1.1
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java?rev=776605&r1=776604&r2=776605&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/parser/list/NumberedListBlock.java Wed May 20 07:53:34 2009 @@ -28,7 +28,7 @@ * * @version $Id$ */ -class NumberedListBlock +public class NumberedListBlock extends ListBlock { /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?rev=776605&r1=776604&r2=776605&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java Wed May 20 07:53:34 2009 @@ -51,6 +51,22 @@ extends AbstractXmlSink implements DocbookMarkup { + /** DocBook V4.4 SGML public id: "-//OASIS//DTD DocBook V4.4//EN" + * @deprecated since 1.1, use {...@link DocbookMarkup#DEFAULT_SGML_PUBLIC_ID} instead of. */ + public static final String DEFAULT_SGML_PUBLIC_ID = DocbookMarkup.DEFAULT_SGML_PUBLIC_ID; + + /** DocBook XML V4.4 XML public id: "-//OASIS//DTD DocBook XML V4.4//EN" + * @deprecated since 1.1, use {...@link DocbookMarkup#DEFAULT_XML_PUBLIC_ID} instead of. */ + public static final String DEFAULT_XML_PUBLIC_ID = DocbookMarkup.DEFAULT_XML_PUBLIC_ID; + + /** DocBook XML V4.4 XML system id: "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" + * @deprecated since 1.1, use {...@link DocbookMarkup#DEFAULT_XML_SYSTEM_ID} instead of. */ + public static final String DEFAULT_XML_SYSTEM_ID = DocbookMarkup.DEFAULT_XML_SYSTEM_ID; + + /** DocBook XML V4.4 SGML system id: "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" + * @deprecated since 1.1, use {...@link DocbookMarkup#DEFAULT_SGML_SYSTEM_ID} instead of. */ + public static final String DEFAULT_SGML_SYSTEM_ID = DocbookMarkup.DEFAULT_SGML_SYSTEM_ID; + /** The output writer. */ private PrintWriter out; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java?rev=776605&r1=776604&r2=776605&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java Wed May 20 07:53:34 2009 @@ -164,9 +164,4 @@ throw new RuntimeException( "DocumentException : " + e.getMessage() ); } } - - private ITextUtil() - { - // private - } }