some fixes for iText 2 but there are still some FIXMEs

Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
===================================================================
--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2008-11-27 21:00:10.000000000 +0100
+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2008-11-27 21:00:15.000000000 +0100
@@ -23,7 +23,7 @@
 
 import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
-import com.lowagie.text.markup.MarkupTags;
+import com.lowagie.text.html.Markup;
 import com.lowagie.text.pdf.DefaultFontMapper;
 import com.lowagie.text.pdf.FontMapper;
 
@@ -38,16 +38,16 @@
 public class ITextFont
 {
     /** A normal font style */
-    public static final String NORMAL = MarkupTags.CSS_VALUE_NORMAL;
+    public static final String NORMAL = Markup.CSS_VALUE_NORMAL;
 
     /** A bold font style */
-    public static final String BOLD = MarkupTags.CSS_VALUE_BOLD;
+    public static final String BOLD = Markup.CSS_VALUE_BOLD;
 
     /** A italic font style */
-    public static final String ITALIC = MarkupTags.CSS_VALUE_ITALIC;
+    public static final String ITALIC = Markup.CSS_VALUE_ITALIC;
 
     /** An underline font style */
-    public static final String UNDERLINE = MarkupTags.CSS_VALUE_UNDERLINE;
+    public static final String UNDERLINE = Markup.CSS_VALUE_UNDERLINE;
 
     /** A default font name */
     public static final String DEFAULT_FONT_NAME = FontFactory.HELVETICA;
@@ -258,7 +258,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getBlue() );
+        return String.valueOf( font.getColor().getBlue() );
     }
 
     /**
@@ -270,7 +270,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getGreen() );
+        return String.valueOf( font.getColor().getGreen() );
     }
 
     /**
@@ -282,7 +282,7 @@
     {
         Font font = getCurrentFont();
 
-        return String.valueOf( font.color().getRed() );
+        return String.valueOf( font.getColor().getRed() );
     }
 
     /**
Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
===================================================================
--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2008-11-27 21:00:10.000000000 +0100
+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2008-11-27 21:00:15.000000000 +0100
@@ -1172,9 +1172,9 @@
         try
         {
             Image image = Image.getInstance( new URL( urlName ) );
-            image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
-            width = image.plainWidth();
-            height = image.plainHeight();
+            image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
+            width = image.getPlainWidth();
+            height = image.getPlainHeight();
         }
         catch ( BadElementException e )
         {
Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
===================================================================
--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2008-11-27 21:00:10.000000000 +0100
+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2008-11-27 21:01:16.000000000 +0100
@@ -22,9 +22,11 @@
 import com.lowagie.text.DocumentException;
 import com.lowagie.text.PageSize;
 import com.lowagie.text.Rectangle;
+/* FIXME: update for iText 2
 import com.lowagie.text.xml.XmlToHtml;
 import com.lowagie.text.xml.XmlToPdf;
 import com.lowagie.text.xml.XmlToRtf;
+*/
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -68,7 +70,7 @@
      */
     public static String getPageSize( Rectangle rect )
     {
-        if ( ( rect.width() == PageSize.LETTER.width() ) && ( rect.height() == PageSize.LETTER.height() ) )
+        if ( ( rect.getWidth() == PageSize.LETTER.getWidth() ) && ( rect.getHeight() == PageSize.LETTER.getHeight() ) )
         {
             return "LETTER";
         }
@@ -109,6 +111,7 @@
      * @throws RuntimeException if any
      * @see com.lowagie.text.xml.XmlToPdf
      */
+    /* FIXME: update for iText 2
     public static void writePdf( InputStream is, OutputStream os )
     {
         try
@@ -122,6 +125,7 @@
             throw new RuntimeException( "DocumentException : " + e.getMessage() );
         }
     }
+    */
 
     /**
      * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an rtf document
@@ -132,6 +136,7 @@
      * @throws RuntimeException if any
      * @see com.lowagie.text.xml.XmlToRtf
      */
+    /* FIXME: update for iText 2
     public static void writeRtf( InputStream is, OutputStream os )
     {
         try
@@ -144,6 +149,7 @@
             throw new RuntimeException( "DocumentException : " + e.getMessage() );
         }
     }
+    */
 
     /**
      * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an html document
@@ -154,6 +160,7 @@
      * @throws RuntimeException if any
      * @see com.lowagie.text.xml.XmlToHtml
      */
+    /* FIXME: update for iText 2
     public static void writeHtml( InputStream is, OutputStream os )
     {
         try
@@ -166,4 +173,5 @@
             throw new RuntimeException( "DocumentException : " + e.getMessage() );
         }
     }
+    */
 }