Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.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/DocbookSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.do import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractXmlSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractXmlSinkFactory; import org.codehaus.plexus.component.annotations.Component; /**
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookParserTest.java Sat Jan 23 16:34:09 2016 @@ -29,9 +29,8 @@ import org.apache.maven.doxia.parser.Abs import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; - +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; import org.codehaus.plexus.util.IOUtil; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java Sat Jan 23 16:34:09 2016 @@ -26,9 +26,9 @@ import java.util.Locale; import javax.swing.text.MutableAttributeSet; import javax.swing.text.SimpleAttributeSet; -import org.apache.maven.doxia.sink.AbstractSinkTest; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkUtils; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.SinkUtils; import org.apache.maven.doxia.util.DoxiaUtils; import org.codehaus.plexus.util.FileUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java Sat Jan 23 16:34:09 2016 @@ -22,8 +22,7 @@ package org.apache.maven.doxia.module.fm import org.apache.maven.doxia.macro.MacroExecutionException; import org.apache.maven.doxia.parser.XhtmlBaseParser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; - +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.codehaus.plexus.util.xml.pull.XmlPullParser; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java Sat Jan 23 16:34:09 2016 @@ -42,8 +42,8 @@ import org.apache.maven.doxia.parser.Abs import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; -import org.apache.maven.doxia.sink.XhtmlBaseSink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.XhtmlBaseSink; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.HtmlTools; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlParserTest.java Sat Jan 23 16:34:09 2016 @@ -30,9 +30,9 @@ import java.util.List; import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; -import org.apache.maven.doxia.sink.XhtmlBaseSink; +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; +import org.apache.maven.doxia.sink.impl.XhtmlBaseSink; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.IOUtil; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java Sat Jan 23 16:34:09 2016 @@ -38,8 +38,8 @@ import org.apache.maven.doxia.document.D import org.apache.maven.doxia.document.DocumentModel; import org.apache.maven.doxia.document.DocumentTOC; import org.apache.maven.doxia.document.DocumentTOCItem; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.HtmlTools; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoConfiguration.java Sat Jan 23 16:34:09 2016 @@ -28,8 +28,7 @@ import javax.swing.text.SimpleAttributeS import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.XMLConfiguration; - -import org.apache.maven.doxia.sink.SinkUtils; +import org.apache.maven.doxia.sink.impl.SinkUtils; import org.codehaus.plexus.util.ReaderFactory; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java Sat Jan 23 16:34:09 2016 @@ -36,10 +36,10 @@ import javax.swing.text.MutableAttribute import javax.swing.text.html.HTML.Attribute; import javax.swing.text.html.HTML.Tag; -import org.apache.maven.doxia.sink.AbstractXmlSink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; -import org.apache.maven.doxia.sink.SinkUtils; +import org.apache.maven.doxia.sink.impl.AbstractXmlSink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkUtils; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.HtmlTools; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.fo import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractXmlSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractXmlSinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java Sat Jan 23 16:34:09 2016 @@ -28,9 +28,9 @@ import org.apache.maven.doxia.document.D import org.apache.maven.doxia.document.DocumentTOC; import org.apache.maven.doxia.document.DocumentTOCItem; import org.apache.maven.doxia.parser.XhtmlBaseParser; -import org.apache.maven.doxia.sink.AbstractSinkTest; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkTestDocument; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.SinkTestDocument; /** * <code>FO Sink</code> Test case. Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.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/ITextSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java Sat Jan 23 16:34:09 2016 @@ -38,9 +38,9 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.maven.doxia.sink.AbstractXmlSink; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.AbstractXmlSink; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.HtmlTools; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.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/ITextSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.it import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractTextSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractTextSinkFactory; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.WriterFactory; import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java Sat Jan 23 16:34:09 2016 @@ -29,7 +29,7 @@ import java.net.URLClassLoader; import org.apache.maven.doxia.AbstractModuleTest; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkTestDocument; +import org.apache.maven.doxia.sink.impl.SinkTestDocument; /** * <code>iText Sink</code> Test case. Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java Sat Jan 23 16:34:09 2016 @@ -19,10 +19,10 @@ package org.apache.maven.doxia.module.la * under the License. */ -import org.apache.maven.doxia.sink.AbstractTextSink; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributes; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.AbstractTextSink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.DoxiaUtils; import org.apache.maven.doxia.util.LineBreaker; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.la import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractTextSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractTextSinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java Sat Jan 23 16:34:09 2016 @@ -22,7 +22,7 @@ package org.apache.maven.doxia.module.la import java.io.Writer; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; /** * @author <a href="mailto:[email protected]";>Jason van Zyl</a> Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/test/java/org/apache/maven/doxia/module/markdown/MarkdownParserTest.java Sat Jan 23 16:34:09 2016 @@ -22,8 +22,8 @@ package org.apache.maven.doxia.module.ma import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.parser.Parser; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; import org.codehaus.plexus.util.IOUtil; import java.io.Reader; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSink.java Sat Jan 23 16:34:09 2016 @@ -38,9 +38,9 @@ import java.util.StringTokenizer; import java.util.TreeSet; import java.util.Vector; -import org.apache.maven.doxia.sink.AbstractTextSink; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.AbstractTextSink; /** * <a href="http://en.wikipedia.org/wiki/Rich_Text_Format";>RTF</a> Sink implementation. Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -22,9 +22,9 @@ package org.apache.maven.doxia.module.rt import java.io.IOException; import java.io.OutputStream; -import org.apache.maven.doxia.sink.AbstractBinarySinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractBinarySinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java Sat Jan 23 16:34:09 2016 @@ -20,8 +20,8 @@ package org.apache.maven.doxia.module.rt */ import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.AbstractSinkTestCase; -import org.apache.maven.doxia.sink.SinkTestDocument; +import org.apache.maven.doxia.sink.impl.AbstractSinkTestCase; +import org.apache.maven.doxia.sink.impl.SinkTestDocument; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.module.apt.AptParser; import org.codehaus.plexus.util.IOUtil; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSink.java Sat Jan 23 16:34:09 2016 @@ -28,10 +28,10 @@ import javax.swing.text.MutableAttribute import javax.swing.text.html.HTML.Attribute; import javax.swing.text.html.HTML.Tag; -import org.apache.maven.doxia.sink.AbstractTextSink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; -import org.apache.maven.doxia.sink.SinkUtils; +import org.apache.maven.doxia.sink.impl.AbstractTextSink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkUtils; import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.util.StringUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.tw import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractTextSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractTextSinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/parser/VerbatimBlock.java Sat Jan 23 16:34:09 2016 @@ -20,7 +20,7 @@ package org.apache.maven.doxia.module.tw */ import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; /** * Represents a verbatim block Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java Sat Jan 23 16:34:09 2016 @@ -21,8 +21,8 @@ package org.apache.maven.doxia.module.tw import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractSinkTest; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.util.StringUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/parser/TwikiParserTest.java Sat Jan 23 16:34:09 2016 @@ -23,8 +23,8 @@ import java.util.Iterator; import org.apache.maven.doxia.module.twiki.TWikiParser; import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.Parser; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; /** * @author ltheussl Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Sat Jan 23 16:34:09 2016 @@ -35,7 +35,7 @@ import org.apache.maven.doxia.parser.Par import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.parser.XhtmlBaseParser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.component.annotations.Component; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java Sat Jan 23 16:34:09 2016 @@ -24,10 +24,10 @@ import java.io.Writer; import javax.swing.text.MutableAttributeSet; import javax.swing.text.html.HTML.Attribute; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; -import org.apache.maven.doxia.sink.SinkUtils; -import org.apache.maven.doxia.sink.XhtmlBaseSink; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkUtils; +import org.apache.maven.doxia.sink.impl.XhtmlBaseSink; import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.util.StringUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.xd import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractXmlSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractXmlSinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java Sat Jan 23 16:34:09 2016 @@ -32,10 +32,9 @@ import org.apache.maven.doxia.parser.Abs import org.apache.maven.doxia.parser.ParseException; import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; - +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; import org.codehaus.plexus.util.IOUtil; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java Sat Jan 23 16:34:09 2016 @@ -20,12 +20,12 @@ package org.apache.maven.doxia.module.xd */ import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.util.HtmlTools; import java.io.StringWriter; import java.io.Writer; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; /** * @author <a href="mailto:[email protected]";>Jason van Zyl</a> Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/AbstractXhtmlSink.java Sat Jan 23 16:34:09 2016 @@ -19,7 +19,7 @@ package org.apache.maven.doxia.module.xh * under the License. */ -import org.apache.maven.doxia.sink.SinkAdapter; +import org.apache.maven.doxia.sink.impl.SinkAdapter; /** * <p>Abstract AbstractXhtmlSink class.</p> Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java Sat Jan 23 16:34:09 2016 @@ -34,8 +34,7 @@ import org.apache.maven.doxia.parser.Par import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.parser.XhtmlBaseParser; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; - +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Sat Jan 23 16:34:09 2016 @@ -24,8 +24,8 @@ import java.io.Writer; import javax.swing.text.MutableAttributeSet; import javax.swing.text.html.HTML.Attribute; -import org.apache.maven.doxia.sink.XhtmlBaseSink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.XhtmlBaseSink; import org.apache.maven.doxia.util.HtmlTools; import org.codehaus.plexus.util.StringUtils; Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java Sat Jan 23 16:34:09 2016 @@ -21,9 +21,9 @@ package org.apache.maven.doxia.module.xh import java.io.Writer; -import org.apache.maven.doxia.sink.AbstractXmlSinkFactory; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkFactory; +import org.apache.maven.doxia.sink.impl.AbstractXmlSinkFactory; import org.codehaus.plexus.component.annotations.Component; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlParserTest.java Sat Jan 23 16:34:09 2016 @@ -25,8 +25,8 @@ import java.util.List; import org.apache.maven.doxia.parser.AbstractParserTest; import org.apache.maven.doxia.parser.Parser; -import org.apache.maven.doxia.sink.SinkEventElement; -import org.apache.maven.doxia.sink.SinkEventTestingSink; +import org.apache.maven.doxia.sink.impl.SinkEventElement; +import org.apache.maven.doxia.sink.impl.SinkEventTestingSink; import org.codehaus.plexus.util.FileUtils; /** Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java (original) +++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java Sat Jan 23 16:34:09 2016 @@ -23,9 +23,9 @@ import java.io.StringWriter; import java.io.Writer; import org.apache.maven.doxia.markup.HtmlMarkup; -import org.apache.maven.doxia.sink.AbstractSinkTest; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; +import org.apache.maven.doxia.sink.impl.AbstractSinkTest; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; /** * @author Jason van Zyl Modified: maven/doxia/doxia/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=1726411&r1=1726410&r2=1726411&view=diff ============================================================================== --- maven/doxia/doxia/trunk/pom.xml (original) +++ maven/doxia/doxia/trunk/pom.xml Sat Jan 23 16:34:09 2016 @@ -274,6 +274,12 @@ under the License. <exclude>org/apache/maven/doxia/module/*/*SiteModule</exclude> <!-- DOXIA-482 --> <exclude>org/apache/maven/doxia/parser/Parser</exclude> + <!-- DOXIA-506 --> + <exclude>org/apache/maven/doxia/sink/**</exclude> + <exclude>org/apache/maven/doxia/index/IndexingSink</exclude> + <exclude>org/apache/maven/doxia/parser/AbstractXmlParser</exclude> + <exclude>org/apache/maven/doxia/module/*/*Sink</exclude> + <exclude>org/apache/maven/doxia/module/*/*SinkFactory</exclude> </excludes> </configuration> </execution>
