Author: jvanzyl Date: Sat Mar 17 22:07:48 2007 New Revision: 519547 URL: http://svn.apache.org/viewvc?view=rev&rev=519547 Log: decoupling module
Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java Modified: maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml?view=diff&rev=519547&r1=519546&r2=519547 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/pom.xml Sat Mar 17 22:07:48 2007 @@ -26,5 +26,4 @@ </parent> <artifactId>doxia-module-docbook-simple</artifactId> <name>Doxia Docbook Simple Module</name> - <version>1.0-alpha-9-SNAPSHOT</version> </project> Modified: maven/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/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java?view=diff&rev=519547&r1=519546&r2=519547 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSink.java Sat Mar 17 22:07:48 2007 @@ -19,7 +19,7 @@ * under the License. */ -import org.apache.maven.doxia.module.apt.AptParser; +import org.apache.maven.doxia.parser.Parser; import org.apache.maven.doxia.sink.SinkAdapter; import org.apache.maven.doxia.sink.StructureSink; import org.apache.maven.doxia.util.FileUtil; @@ -727,13 +727,13 @@ String justif; switch ( justification[i] ) { - case AptParser.JUSTIFY_LEFT: + case Parser.JUSTIFY_LEFT: justif = "left"; break; - case AptParser.JUSTIFY_RIGHT: + case Parser.JUSTIFY_RIGHT: justif = "right"; break; - case AptParser.JUSTIFY_CENTER: + case Parser.JUSTIFY_CENTER: default: justif = "center"; break; Modified: maven/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/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?view=diff&rev=519547&r1=519546&r2=519547 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java Sat Mar 17 22:07:48 2007 @@ -21,6 +21,11 @@ import org.apache.maven.doxia.sink.AbstractSinkTestCase; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.parser.Parser; + +import java.io.Reader; +import java.io.InputStream; +import java.io.InputStreamReader; /** * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a> @@ -34,9 +39,24 @@ return "docbook"; } + protected Parser createParser() + { + return new DocBookParser(); + } + protected Sink createSink() throws Exception { return new DocBookSink( getTestWriter() ); + } + + protected Reader getTestReader() + throws Exception + { + InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( "guide.xml" ); + + InputStreamReader reader = new InputStreamReader( is ); + + return reader; } }