svn commit: r595397 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo: pom.xml src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java

[ltheussl]

Author: ltheussl
Date: Thu Nov 15 11:13:46 2007
New Revision: 595397

URL: http://svn.apache.org/viewvc?rev=595397&view=rev
Log:
Remove docrenderer dependency, DocumentModel is now in core.

Modified:
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
    
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml?rev=595397&r1=595396&r2=595397&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/pom.xml Thu Nov 15 
11:13:46 2007
@@ -43,22 +43,6 @@
     </developer>
   </developers>
   <dependencies>
-    <!-- TODO: remove, see DOXIA-159 -->
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-doc-renderer</artifactId>
-      <version>${projectVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-component-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-container-default</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>commons-configuration</groupId>
       <artifactId>commons-configuration</artifactId>

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=595397&r1=595396&r2=595397&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
 Thu Nov 15 11:13:46 2007
@@ -25,10 +25,10 @@
 
 import javax.swing.text.html.HTML.Tag;
 
-import org.apache.maven.doxia.docrenderer.document.DocumentMeta;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOC;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOCItem;
+import org.apache.maven.doxia.document.DocumentMeta;
+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.util.HtmlTools;
 
 /**

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=595397&r1=595396&r2=595397&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
 Thu Nov 15 11:13:46 2007
@@ -22,10 +22,10 @@
 import java.io.File;
 import java.io.Writer;
 
-import org.apache.maven.doxia.docrenderer.document.DocumentMeta;
-import org.apache.maven.doxia.docrenderer.document.DocumentModel;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOC;
-import org.apache.maven.doxia.docrenderer.document.DocumentTOCItem;
+import org.apache.maven.doxia.document.DocumentMeta;
+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.Sink;
 import org.apache.maven.doxia.sink.AbstractSinkTest;