svn commit: r739254 - in /maven/doxia/doxia/trunk/doxia-modules: doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/ doxia-module-xdoc/src/main/java/org/apache/maven/doxia

2009-01-30 Thread vsiveton
Author: vsiveton
Date: Fri Jan 30 12:15:08 2009
New Revision: 739254

URL: http://svn.apache.org/viewvc?rev=739254&view=rev
Log:
o improve javadoc

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/XdocSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.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?rev=739254&r1=739253&r2=739254&view=diff
==
--- 
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
 Fri Jan 30 12:15:08 2009
@@ -39,7 +39,10 @@
 import org.codehaus.plexus.util.FileUtils;
 
 /**
- * Docbook Sink implementation.
+ * http://www.oasis-open.org/docbook";>Docbook Sink implementation.
+ * 
+ * It uses the Docbook v4.4 DTD http://www.oasis-open.org/docbook/sgml/4.4/docbookx.dtd";>
+ * http://www.oasis-open.org/docbook/sgml/4.4/docbookx.dtd.
  *
  * @version $Id$
  * @since 1.0

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.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/XdocSink.java?rev=739254&r1=739253&r2=739254&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 Fri Jan 30 12:15:08 2009
@@ -32,7 +32,10 @@
 import org.apache.maven.doxia.util.HtmlTools;
 
 /**
- * Xdoc Sink implementation.
+ * http://maven.apache.org/doxia/references/xdoc-format.html";>Xdoc Sink 
implementation.
+ * 
+ * It uses the Xdoc XSD http://maven.apache.org/xsd/xdoc-2.0.xsd";>
+ * http://maven.apache.org/xsd/xdoc-2.0.xsd.
  *
  * @author mailto:ja...@jamestaylor.org";>James Taylor
  * @version $Id$

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=739254&r1=739253&r2=739254&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
 Fri Jan 30 12:15:08 2009
@@ -29,7 +29,10 @@
 import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 
 /**
- * Xhtml sink implementation.
+ * http://www.w3.org/TR/xhtml1/";>Xhtml 1.0 Transitional sink 
implementation.
+ * 
+ * It uses the DTD/xhtml1-transitional http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+ * http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd.
  *
  * @author Jason van Zyl
  * @author ltheussl




svn commit: r739256 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src: main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java test/java/org/apache/maven/doxia/module/xdoc/XdocSinkT

2009-01-30 Thread vsiveton
Author: vsiveton
Date: Fri Jan 30 12:19:44 2009
New Revision: 739256

URL: http://svn.apache.org/viewvc?rev=739256&view=rev
Log:
o using double quote

Modified:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.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/XdocSink.java?rev=739256&r1=739255&r2=739256&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 Fri Jan 30 12:19:44 2009
@@ -106,10 +106,10 @@
 
 setHeadFlag( true );
 
-write( "" );
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=739256&r1=739255&r2=739256&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 Fri Jan 30 12:19:44 2009
@@ -72,7 +72,7 @@
 /** {...@inheritdoc} */
 protected String getHeadBlock()
 {
-return "";
+return "";
 }
 
 /** {...@inheritdoc} */




svn commit: r739257 - in /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src: main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java test/java/org/apache/maven/doxia/module/xdoc/XdocSinkT

2009-01-30 Thread vsiveton
Author: vsiveton
Date: Fri Jan 30 12:25:40 2009
New Revision: 739257

URL: http://svn.apache.org/viewvc?rev=739257&view=rev
Log:
o added the xdoc xsd in the sink

Modified:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.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/XdocSink.java?rev=739257&r1=739256&r2=739257&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 Fri Jan 30 12:25:40 2009
@@ -113,7 +113,12 @@
 }
 write( "?>" );
 
-writeStartTag( DOCUMENT_TAG );
+MutableAttributeSet atts = new SinkEventAttributeSet();
+atts.addAttribute( "xmlns", "http://maven.apache.org/XDOC/2.0"; );
+atts.addAttribute( "xmlns:xsi", 
"http://www.w3.org/2001/XMLSchema-instance"; );
+atts.addAttribute( "xsi:schemaLocation", 
"http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"; );
+
+writeStartTag( DOCUMENT_TAG, atts );
 
 writeStartTag( PROPERTIES_TAG );
 }

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=739257&r1=739256&r2=739257&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
 Fri Jan 30 12:25:40 2009
@@ -72,7 +72,11 @@
 /** {...@inheritdoc} */
 protected String getHeadBlock()
 {
-return "";
+return ""
++ "http://maven.apache.org/XDOC/2.0\"; "
++ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; "
++ "xsi:schemaLocation=\"http://maven.apache.org/XDOC/2.0 
http://maven.apache.org/xsd/xdoc-2.0.xsd\";>"
++ "";
 }
 
 /** {...@inheritdoc} */




svn commit: r739258 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java

2009-01-30 Thread vsiveton
Author: vsiveton
Date: Fri Jan 30 12:30:53 2009
New Revision: 739258

URL: http://svn.apache.org/viewvc?rev=739258&view=rev
Log:
o added a constant for xdoc system id

Modified:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.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/XdocSink.java?rev=739258&r1=739257&r2=739258&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
 Fri Jan 30 12:30:53 2009
@@ -45,6 +45,9 @@
 extends XhtmlBaseSink
 implements XdocMarkup
 {
+/** XDoc system id: "http://maven.apache.org/xsd/xdoc-2.0.xsd"; */
+public static final String XDOC_SYSTEM_ID = 
"http://maven.apache.org/xsd/xdoc-2.0.xsd";;
+
 // --
 // Instance fields
 // --
@@ -116,7 +119,7 @@
 MutableAttributeSet atts = new SinkEventAttributeSet();
 atts.addAttribute( "xmlns", "http://maven.apache.org/XDOC/2.0"; );
 atts.addAttribute( "xmlns:xsi", 
"http://www.w3.org/2001/XMLSchema-instance"; );
-atts.addAttribute( "xsi:schemaLocation", 
"http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"; );
+atts.addAttribute( "xsi:schemaLocation", 
"http://maven.apache.org/XDOC/2.0 " + XDOC_SYSTEM_ID );
 
 writeStartTag( DOCUMENT_TAG, atts );