Author: jvanzyl Date: Sat Mar 17 22:08:00 2007 New Revision: 519549 URL: http://svn.apache.org/viewvc?view=rev&rev=519549 Log: decoupling module
Modified: maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java Modified: maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml?view=diff&rev=519549&r1=519548&r2=519549 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml Sat Mar 17 22:08:00 2007 @@ -28,7 +28,6 @@ <modelVersion>4.0.0</modelVersion> <artifactId>doxia-module-itext</artifactId> <name>Doxia iText Module</name> - <version>1.0-SNAPSHOT</version> <developers> <developer> <id>vsiveton</id> @@ -51,9 +50,20 @@ <groupId>xpp3</groupId> <artifactId>xpp3</artifactId> <version>1.1.3.4-RC3</version> - </dependency> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-apt</artifactId> + <version>${projectVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <version>${projectVersion}</version> + <scope>test</scope> + </dependency> </dependencies> - <build> <plugins> <plugin> Modified: maven/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/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?view=diff&rev=519549&r1=519548&r2=519549 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java Sat Mar 17 22:08:00 2007 @@ -22,7 +22,7 @@ import com.lowagie.text.BadElementException; import com.lowagie.text.ElementTags; import com.lowagie.text.Image; -import org.apache.maven.doxia.module.HtmlTools; +import org.apache.maven.doxia.util.HtmlTools; import org.apache.maven.doxia.sink.Sink; import org.apache.maven.doxia.sink.SinkAdapter; import org.codehaus.plexus.util.IOUtil; Modified: maven/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/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java?view=diff&rev=519549&r1=519548&r2=519549 ============================================================================== --- maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java (original) +++ maven/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java Sat Mar 17 22:08:00 2007 @@ -118,6 +118,8 @@ new FileOutputStream( getGeneratedFile( "test_itext_apt", ".pdf" ) ) ); } + // DOXIA- + /** * Generate a pdf and a rtf from an <code>apt</code> file * @@ -129,15 +131,13 @@ Sink sink = createSink( "test_apt", ".xml" ); AptParser parser = new AptParser(); + parser.parse( getAptReader( "apt/test.apt" ), sink ); sink.close(); ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "test_apt", ".xml" ) ), new FileOutputStream( getGeneratedFile( "test_apt", ".pdf" ) ) ); - - //ITextUtil.writeRtf( new FileInputStream( getGeneratedFile( "test_apt", ".xml" ) ), - // new FileOutputStream( getGeneratedFile( "test_apt", ".rtf" ) ) ); } /** @@ -151,6 +151,7 @@ Sink sink = createSink( "guide-ide-netbeans_apt", ".xml" ); AptParser parser = new AptParser(); + parser.parse( getAptReader( "apt/guide-ide-netbeans.apt" ), sink ); sink.close(); @@ -173,6 +174,7 @@ Sink sink = createSink( "test_xdoc", ".xml" ); XdocParser parser = new XdocParser(); + parser.parse( getXdocReader( "xdoc/test.xml" ), sink ); sink.close();