svn commit: r586718 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/
Author: dennisl Date: Sat Oct 20 06:45:06 2007 New Revision: 586718 URL: http://svn.apache.org/viewvc?rev=586718&view=rev Log: o Create a branch for future alpha releases. Added: maven/doxia/doxia/branches/doxia-1.0-alpha-x/ - copied from r586717, maven/doxia/doxia/tags/doxia-1.0-alpha-9/
svn commit: r586733 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Author: dennisl Date: Sat Oct 20 07:43:49 2007 New Revision: 586733 URL: http://svn.apache.org/viewvc?rev=586733&view=rev Log: o Apply r580622 to the branch. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/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/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=586733&r1=586732&r2=586733&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Sat Oct 20 07:43:49 2007 @@ -961,7 +961,11 @@ String id = HtmlTools.encodeId( name ); MutableAttributeSet att = new SimpleAttributeSet(); -att.addAttribute( Attribute.NAME, id ); + +if ( id != null ) +{ +att.addAttribute( Attribute.NAME, id ); +} writeStartTag( Tag.A, att ); }
svn commit: r586734 - in /maven/doxia/doxia/branches/doxia-1.0-alpha-x: doxia-book/ doxia-core/ doxia-maven-plugin/ doxia-modules/ doxia-modules/doxia-module-apt/ doxia-modules/doxia-module-confluence
Author: dennisl Date: Sat Oct 20 07:47:25 2007 New Revision: 586734 URL: http://svn.apache.org/viewvc?rev=586734&view=rev Log: o Apply the dependency cleanup from r580699, r580700, r580701, r580703, r580705, r580706, r580707, r580708, r580709, r580710, r580711, r580712, r580713, r580714, r580719, r580721 to the branch. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-confluence/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-docbook-simple/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-fml/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-itext/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-latex/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-rtf/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/pom.xml maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/pom.xml Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml?rev=586734&r1=586733&r2=586734&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-book/pom.xml Sat Oct 20 07:47:25 2007 @@ -31,44 +31,61 @@ A component to write books like user manuals and guides in any format supported by Doxia. - ${project.groupId} + org.apache.maven.doxia doxia-core - ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-xdoc ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-xhtml ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-apt ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-itext ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-latex ${projectVersion} - ${project.groupId} + org.apache.maven.doxia doxia-module-docbook-simple ${projectVersion} + org.apache.maven.doxia + doxia-sink-api + + + + commons-cli + commons-cli + 1.0 + + + org.codehaus.plexus + plexus-container-default + + org.codehaus.plexus plexus-i18n 1.0-beta-6 + + + org.codehaus.plexus + plexus-utils org.codehaus.plexus Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml?rev=586734&r1=586733&r2=586734&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-core/pom.xml Sat Oct 20 07:47:25 2007 @@ -54,11 +54,6 @@ - oro - oro - 2.0.7 - - org.apache.maven.doxia doxia-sink-api @@ -70,11 +65,5 @@ org.codehaus.plexus plexus-container-default - Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml?rev=586734&r1=586733&r2=586734&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/pom.xml Sat Oct 20 07:47:25 2007 @@ -40,16 +40,6 @@ 2.0 - org.apache.maven.reporting - maven-reporting-api - 2.0.2 - - - org.apache.maven.reporting - maven-reporting-impl - 2.0.2 - - ${project.groupId} doxia-book ${projectVersion} Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-apt/pom.xml?rev=586734&r1=586733&r2=586734&view=diff ===
svn commit: r586736 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Author: dennisl Date: Sat Oct 20 07:50:01 2007 New Revision: 586736 URL: http://svn.apache.org/viewvc?rev=586736&view=rev Log: [DOXIA-156] Apply fix to the branch. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/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/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java?rev=586736&r1=586735&r2=586736&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java Sat Oct 20 07:50:01 2007 @@ -861,7 +861,7 @@ if ( width != null ) { -att.addAttribute( Attribute.COLSPAN, width ); +att.addAttribute( Attribute.WIDTH, width ); } if ( justif != null )
svn commit: r586737 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Author: dennisl Date: Sat Oct 20 07:57:01 2007 New Revision: 586737 URL: http://svn.apache.org/viewvc?rev=586737&view=rev Log: o Apply r583721 to the branch. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=586737&r1=586736&r2=586737&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Sat Oct 20 07:57:01 2007 @@ -301,26 +301,28 @@ } else if ( parser.getName().equals( Tag.TH.toString() ) ) { -String colspan = parser.getAttributeValue( null, Attribute.COLSPAN.toString() ); -if ( colspan == null ) +String width = parser.getAttributeValue( null, Attribute.WIDTH.toString() ); + +if ( width == null ) { sink.tableHeaderCell(); } else { -sink.tableHeaderCell( colspan ); +sink.tableHeaderCell( width ); } } else if ( parser.getName().equals( Tag.TD.toString() ) ) { -String colspan = parser.getAttributeValue( null, Attribute.COLSPAN.toString() ); -if ( colspan == null ) +String width = parser.getAttributeValue( null, Attribute.WIDTH.toString() ); + +if ( width == null ) { sink.tableCell(); } else { -sink.tableCell( colspan ); +sink.tableCell( width ); } }
svn commit: r586741 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml
Author: dennisl Date: Sat Oct 20 08:12:20 2007 New Revision: 586741 URL: http://svn.apache.org/viewvc?rev=586741&view=rev Log: o Adjust scm URLs to the new branch location. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml?rev=586741&r1=586740&r2=586741&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/pom.xml Sat Oct 20 08:12:20 2007 @@ -89,9 +89,9 @@ - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-9 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-9 - https://svn.apache.org/repos/asf/maven/doxia/doxia/tags/doxia-1.0-alpha-9 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/branches/doxia-1.0-alpha-x/ + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia/branches/doxia-1.0-alpha-x/ + https://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/
svn commit: r586742 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/
Author: dennisl Date: Sat Oct 20 08:22:14 2007 New Revision: 586742 URL: http://svn.apache.org/viewvc?rev=586742&view=rev Log: o Create a branch for future alpha releases. Added: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/ - copied from r586741, maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-9/
svn commit: r586744 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x: doxia-decoration-model/pom.xml doxia-doc-renderer/pom.xml doxia-site-renderer/pom.xml pom.xml
Author: dennisl Date: Sat Oct 20 08:25:52 2007 New Revision: 586744 URL: http://svn.apache.org/viewvc?rev=586744&view=rev Log: o Next version from this branch will be 1.0-alpha-10. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-decoration-model/pom.xml maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-decoration-model/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-decoration-model/pom.xml?rev=586744&r1=586743&r2=586744&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-decoration-model/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-decoration-model/pom.xml Sat Oct 20 08:25:52 2007 @@ -24,7 +24,7 @@ doxia-sitetools org.apache.maven.doxia -1.0-alpha-9 +1.0-alpha-10-SNAPSHOT doxia-decoration-model Doxia Decoration Model Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml?rev=586744&r1=586743&r2=586744&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml Sat Oct 20 08:25:52 2007 @@ -24,7 +24,7 @@ doxia-sitetools org.apache.maven.doxia -1.0-alpha-9 +1.0-alpha-10-SNAPSHOT doxia-doc-renderer Doxia Document Renderer Component Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml?rev=586744&r1=586743&r2=586744&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml Sat Oct 20 08:25:52 2007 @@ -24,7 +24,7 @@ doxia-sitetools org.apache.maven.doxia -1.0-alpha-9 +1.0-alpha-10-SNAPSHOT doxia-site-renderer Doxia Site Renderer Component Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml?rev=586744&r1=586743&r2=586744&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml Sat Oct 20 08:25:52 2007 @@ -30,7 +30,7 @@ org.apache.maven.doxia doxia-sitetools - 1.0-alpha-9 + 1.0-alpha-10-SNAPSHOT pom Doxia Sitetools @@ -39,7 +39,7 @@ ${project.version} -1.0-alpha-9 +1.0-alpha-10-SNAPSHOT
svn commit: r586746 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x: doxia-doc-renderer/pom.xml doxia-site-renderer/pom.xml
Author: dennisl Date: Sat Oct 20 08:32:02 2007 New Revision: 586746 URL: http://svn.apache.org/viewvc?rev=586746&view=rev Log: o Apply r580726 to the branch. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml?rev=586746&r1=586745&r2=586746&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-doc-renderer/pom.xml Sat Oct 20 08:32:02 2007 @@ -70,13 +70,17 @@ doxia-core + org.apache.maven.doxia + doxia-sink-api + + com.lowagie itext 1.4 org.codehaus.plexus - plexus-i18n + plexus-container-default org.apache.maven.doxia Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml?rev=586746&r1=586745&r2=586746&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/doxia-site-renderer/pom.xml Sat Oct 20 08:32:02 2007 @@ -55,12 +55,20 @@ org.codehaus.plexus + plexus-container-default + + + org.codehaus.plexus plexus-velocity 1.1.7 commons-collections commons-collections + + + org.codehaus.plexus + plexus-component-api velocity
svn commit: r586747 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml
Author: dennisl Date: Sat Oct 20 08:32:31 2007 New Revision: 586747 URL: http://svn.apache.org/viewvc?rev=586747&view=rev Log: o Adjust scm URLs to the new branch location. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml?rev=586747&r1=586746&r2=586747&view=diff == --- maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml (original) +++ maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/pom.xml Sat Oct 20 08:32:31 2007 @@ -91,9 +91,9 @@ - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-9 - scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-9 - https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/doxia-sitetools-1.0-alpha-9 + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/ + scm:svn:https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/ + https://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0-alpha-x/
svn commit: r586769 - /maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt
Author: dennisl Date: Sat Oct 20 11:28:08 2007 New Revision: 586769 URL: http://svn.apache.org/viewvc?rev=586769&view=rev Log: o Update doxia version in the docs. Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt Modified: maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt URL: http://svn.apache.org/viewvc/maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt?rev=586769&r1=586768&r2=586769&view=diff == --- maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt (original) +++ maven/doxia/doxia/branches/doxia-1.0-alpha-x/doxia-maven-plugin/src/site/apt/usage.apt Sat Oct 20 11:28:08 2007 @@ -12,7 +12,7 @@ org.apache.maven.doxia doxia-maven-plugin -1.0-alpha-9 +1.0-alpha-10 pre-site