svn commit: r562700 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/util/ doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/ doxia-modules/doxia-module-xdoc/src/main/java/org/ap...

[vsiveton]

Author: vsiveton
Date: Sat Aug  4 04:54:11 2007
New Revision: 562700

URL: http://svn.apache.org/viewvc?view=rev&rev=562700
Log:
DOXIA-56: clean up doxia api and code

o removed FileUtil and StringUtil: using classes inside plexus-utils instead of
o removed unused WrappedException class

Removed:
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/FileUtil.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/StringUtil.java
    
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/WrappedException.java
Modified:
    
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-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java

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?view=diff&rev=562700&r1=562699&r2=562700
==============================================================================
--- 
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
 Sat Aug  4 04:54:11 2007
@@ -22,8 +22,8 @@
 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;
 import org.apache.maven.doxia.util.LineBreaker;
+import org.codehaus.plexus.util.FileUtils;
 
 import java.io.StringWriter;
 import java.io.Writer;
@@ -632,7 +632,7 @@
     {
         if ( graphicsFileName != null )
         {
-            String format = FileUtil.fileExtension( graphicsFileName 
).toUpperCase();
+            String format = FileUtils.extension( graphicsFileName 
).toUpperCase();
             if ( format.length() == 0 )
             {
                 format = "JPEG";

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.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/XmlWriterXdocSink.java?view=diff&rev=562700&r1=562699&r2=562700
==============================================================================
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
 Sat Aug  4 04:54:11 2007
@@ -23,7 +23,7 @@
 import org.apache.maven.doxia.sink.SinkAdapter;
 import org.apache.maven.doxia.sink.StructureSink;
 import org.apache.maven.doxia.util.HtmlTools;
-import org.apache.maven.doxia.util.StringUtil;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.XMLWriter;
 
 /**
@@ -690,7 +690,7 @@
      */
     protected void verbatimContent( String text )
     {
-        writer.writeText( StringUtil.replaceAll( text, " ", " " ) );
+        writer.writeText( StringUtils.replace( text, " ", " " ) );
     }
 
     /**