date:20090131

svn commit: r739555 - in /maven/doxia/doxia/trunk: doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/ doxia-book/src/test/resources/expected/doc-book/ doxia-modules/doxia-

2009-01-31 Thread vsiveton

Author: vsiveton
Date: Sat Jan 31 13:27:29 2009
New Revision: 739555

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

Modified:

maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java

maven/doxia/doxia/trunk/doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml

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-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

Modified: 
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java?rev=739555&r1=739554&r2=739555&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/DocBookBookSinkTest.java
 Sat Jan 31 13:27:29 2009
@@ -234,7 +234,7 @@
  */
 protected String getBookBlock()
 {
-return "";
 }
 

Modified: 
maven/doxia/doxia/trunk/doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml?rev=739555&r1=739554&r2=739555&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-book/src/test/resources/expected/doc-book/plexus-user-guide.xml
 Sat Jan 31 13:27:29 2009
@@ -1,4 +1,4 @@
-http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd";>
 Test Book
 

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=739555&r1=739554&r2=739555&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
 Sat Jan 31 13:27:29 2009
@@ -551,10 +551,10 @@
 {
 if ( xmlMode )
 {
-markup( "" );
 

Modified: 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.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/FoSink.java?rev=739555&r1=739554&r2=739555&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java
 Sat Jan 31 13:27:29 2009
@@ -990,10 +990,10 @@
  */
 public void beginDocument()
 {
-write( "" );

svn commit: r739556 - in /maven/doxia: doxia-sitetools/trunk/pom.xml doxia-tools/trunk/pom.xml doxia/trunk/pom.xml

2009-01-31 Thread vsiveton

Author: vsiveton
Date: Sat Jan 31 13:33:44 2009
New Revision: 739556

URL: http://svn.apache.org/viewvc?rev=739556&view=rev
Log:
o using Modello release

Modified:
maven/doxia/doxia-sitetools/trunk/pom.xml
maven/doxia/doxia-tools/trunk/pom.xml
maven/doxia/doxia/trunk/pom.xml

Modified: maven/doxia/doxia-sitetools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=739556&r1=739555&r2=739556&view=diff
==
--- maven/doxia/doxia-sitetools/trunk/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/pom.xml Sat Jan 31 13:33:44 2009
@@ -193,34 +193,6 @@
 
   
 
-  
-  
-
-  codehaus.snapshots
-  CodeHaus Snapshots
-  http://snapshots.repository.codehaus.org
-  
-false
-  
-  
-true
-  
-
-  
-  
-
-  codehaus.snapshots
-  CodeHaus Plugin Snapshots
-  http://snapshots.repository.codehaus.org
-  
-false
-  
-  
-true
-  
-
-  
-
   
 
   
@@ -248,11 +220,10 @@
   plexus-maven-plugin
   1.3.5
 
-
 
   org.codehaus.modello
   modello-maven-plugin
-  1.0-beta-1-SNAPSHOT
+  1.0
 
   
 

Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=739556&r1=739555&r2=739556&view=diff
==
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Sat Jan 31 13:33:44 2009
@@ -137,19 +137,6 @@
   
 
   
-
-  
-org.codehaus.plexus
-plexus-maven-plugin
-
-  
-
-  descriptor
-
-  
-
-  
-
 
   
 
@@ -165,13 +152,32 @@
 never
   
 
+
 
   org.codehaus.plexus
   plexus-maven-plugin
   1.3.5
 
+
+  org.codehaus.modello
+  modello-maven-plugin
+  1.0
+
   
 
+
+  
+org.codehaus.plexus
+plexus-maven-plugin
+
+  
+
+  descriptor
+
+  
+
+  
+
   
 
   

Modified: maven/doxia/doxia/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/pom.xml?rev=739556&r1=739555&r2=739556&view=diff
==
--- maven/doxia/doxia/trunk/pom.xml (original)
+++ maven/doxia/doxia/trunk/pom.xml Sat Jan 31 13:33:44 2009
@@ -171,34 +171,6 @@
 
   
 
-  
-  
-
-  codehaus.snapshots
-  CodeHaus Snapshots
-  http://snapshots.repository.codehaus.org
-  
-false
-  
-  
-true
-  
-
-  
-  
-
-  codehaus.snapshots
-  CodeHaus Plugin Snapshots
-  http://snapshots.repository.codehaus.org
-  
-false
-  
-  
-true
-  
-
-  
-
   
 
   
@@ -232,11 +204,10 @@
   plexus-maven-plugin
   1.3.5
 
-
 
   org.codehaus.modello
   modello-maven-plugin
-  1.0-beta-1-SNAPSHOT
+  1.0

svn commit: r739557 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/markup/ doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook

2009-01-31 Thread vsiveton

Author: vsiveton
Date: Sat Jan 31 13:54:32 2009
New Revision: 739557

URL: http://svn.apache.org/viewvc?rev=739557&view=rev
Log:
o added/moved XML namespace, systemId and publicId in the markup interfaces

Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java

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-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookMarkup.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlMarkup.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/test/java/org/apache/maven/doxia/module/fml/FmlValidatorTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoMarkup.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocMarkup.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-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocValidatorTest.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlMarkup.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-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java?rev=739557&r1=739556&r2=739557&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/markup/XmlMarkup.java
 Sat Jan 31 13:54:32 2009
@@ -29,6 +29,9 @@
 public interface XmlMarkup
 extends Markup
 {
+/** XML namespace: "http://www.w3.org/2001/XMLSchema-instance"; */
+String XML_NAMESPACE = "http://www.w3.org/2001/XMLSchema-instance";;
+
 // --
 // Xml separator characters
 // --

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=739557&r1=739556&r2=739557&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
 Sat Jan 31 13:54:32 2009
@@ -51,17 +51,21 @@
 extends AbstractXmlSink
 implements DocbookMarkup
 {
-/** DocBook V4.4 SGML public id: "-//OASIS//DTD DocBook V4.4//EN" */
-public static final String DEFAULT_SGML_PUBLIC_ID = "-//OASIS//DTD DocBook 
V4.4//EN";
-
-/** DocBook XML V4.4 XML public id: "-//OASIS//DTD DocBook XML V4.4//EN" */
-public static final String DEFAULT_XML_PUBLIC_ID = "-//OASIS//DTD DocBook 
V4.4//EN";
-
-/** DocBook XML V4.4 XML system id: 
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; */
-public static final String DEFAULT_XML_SYSTEM_ID = 
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd";;
-
-/** DocBook XML V4.4 SGML system id: 
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; */
-public static final String DEFAULT_SGML_SYSTEM_ID = 
"http://www.oasis-open.org/docbook/sgml/4.4/docbookx.dtd";;
+/** DocBook V4.4 SGML public id: "-//OASIS//DTD DocBook V4.4//EN"
+ * @deprecated since 1.1, use {...@link 
DocbookMarkup#DEFAULT_SGML_PUBLIC_ID} instead of. */
+public static final String DEFAULT_SGML_PUBLIC_ID = 
DocbookMarkup.DEFAULT_SGML_PUBLIC_ID;
+
+/** DocBook XML V4.4 XML public id: "-//OASIS//DTD DocBook XML V4.4//EN"
+ * @deprecated since 1.1, use {...@link 
DocbookMarkup#DEFAULT_XML_PUBLIC_ID} instead of. */
+public static final String DEFAULT_XML_PUBLIC_ID = 
DocbookMarkup.DEFAULT_XML_PUBLIC_ID;
+
+/** DocBook XML V4.4 XML system id: 
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd";
+ * @de

svn commit: r739565 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/

2009-01-31 Thread vsiveton

Author: vsiveton
Date: Sat Jan 31 14:39:03 2009
New Revision: 739565

URL: http://svn.apache.org/viewvc?rev=739565&view=rev
Log:
DOXIA-277: Specify the language identification

o handle languageId in xml sinks
o added methods in the xml factories
o added test cases

Added:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkWithLanguageIdTest.java
   (with props)

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkWithLanguageIdTest.java
   (with props)
Modified:

maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSinkFactory.java

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-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.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-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java

Modified: 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSinkFactory.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSinkFactory.java?rev=739565&r1=739564&r2=739565&view=diff
==
--- 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSinkFactory.java
 (original)
+++ 
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractXmlSinkFactory.java
 Sat Jan 31 14:39:03 2009
@@ -19,6 +19,8 @@
  * under the License.
  */
 
+import java.io.Writer;
+
 /**
  * An abstract SinkFactory for XML markup syntax. 
UTF-8 is used
  * when no encoding is specified.
@@ -29,5 +31,16 @@
 public abstract class AbstractXmlSinkFactory
 extends AbstractTextSinkFactory
 {
-// nop
+/**
+ * Create a text Sink for a given encoding and for a given language 
identifier.
+ *
+ * @param writer The writer for the sink output, never null.
+ * @param encoding The character encoding used by the writer.
+ * @param languageId language identifier for the root element as defined by
+ * ftp://ftp.isi.edu/in-notes/bcp/bcp47.txt";>IETF BCP 47, 
Tags for the Identification of Languages;
+ * in addition, the empty string may be specified.
+ * @return a Sink for XML output in the given encoding.
+ * @see http://www.w3.org/TR/REC-xml/#sec-lang-tag";>http://www.w3.org/TR/REC-xml/#sec-lang-tag
+ */
+protected abstract Sink createSink( Writer writer, String encoding, String 
languageId );
 }

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=739565&r1=739564&r2=739565&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
 Sat Jan 31 14:39:03 2009
@@ -178,6 +178,23 @@
 }
 
 /**
+ * Constructor, initialize the Writer and tells which encoding and 
languageId are used.
+ *
+ * @param writer not null writer to write the result.
+ * @param encoding the encoding used, that should be written to the 
generated HTML content
+ * if not null.
+ * @param languageId language identifier for the root element as defined by
+ * ftp://ftp.isi.edu/in-notes/bcp/bcp47.txt";>IETF BCP 47, 
Tags for the Identification of Languages;
+ * in addition, the empty string may be specified.
+ */
+protected DocBookSink( Writer writer, String encoding, String languageId )
+{
+this( writer, encoding );
+
+this.lang = languageId;
+}
+
+/**
  * @param text The text to escape.
  * @param xml

svn commit: r739566 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/StringsMap.java

2009-01-31 Thread vsiveton

Author: vsiveton
Date: Sat Jan 31 14:43:33 2009
New Revision: 739566

URL: http://svn.apache.org/viewvc?rev=739566&view=rev
Log:
o removed unused class

Removed:

maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/StringsMap.java

svn commit: r739555 - in /maven/doxia/doxia/trunk: doxia-book/src/test/java/org/apache/maven/doxia/book/services/renderer/docbook/ doxia-book/src/test/resources/expected/doc-book/ doxia-modules/doxia-

svn commit: r739556 - in /maven/doxia: doxia-sitetools/trunk/pom.xml doxia-tools/trunk/pom.xml doxia/trunk/pom.xml

svn commit: r739557 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/markup/ doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook

svn commit: r739565 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/

svn commit: r739566 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/StringsMap.java

5 matches

Site Navigation

Mail list logo

Footer information