svn commit: r542277 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Author: jvanzyl
Date: Mon May 28 10:25:32 2007
New Revision: 542277
URL: http://svn.apache.org/viewvc?view=rev&rev=542277
Log:
DOXIA-107 Make XDoc sink honor figures
Submitted by: Eric Redmond
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?view=diff&rev=542277&r1=542276&r2=542277
==
---
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
Mon May 28 10:25:32 2007
@@ -389,6 +389,31 @@
markup( "" + EOL );
}
+public void figure()
+{
+markup( "" );
+}
+
+public void figureGraphics(String s)
+{
+markup( " src=\"" + s + "\"" );
+}
+
+public void figureCaption()
+{
+markup( " alt=\"" );
+}
+
+public void figureCaption_()
+{
+markup( "\"" );
+}
+
public void paragraph()
{
if ( !itemFlag )
svn commit: r542279 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
Author: jvanzyl
Date: Mon May 28 10:37:43 2007
New Revision: 542279
URL: http://svn.apache.org/viewvc?view=rev&rev=542279
Log:
DOXIA-28 Adding a xdoc sink that uses the xml writer, it is actually nicer.
Submitted by: Juan F. Codagnone
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
(with props)
Added:
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=auto&rev=542279
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
(added)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
Mon May 28 10:37:43 2007
@@ -0,0 +1,587 @@
+package org.codehaus.doxia.module.xdoc;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.doxia.util.HtmlTools;
+import org.apache.maven.doxia.sink.SinkAdapter;
+import org.apache.maven.doxia.sink.StructureSink;
+import org.codehaus.plexus.util.xml.XMLWriter;
+import org.apache.maven.doxia.parser.Parser;
+
+/**
+ * A doxia Sink which produces an xdoc document.
+ *
+ * @author juan mailto:[EMAIL PROTECTED]">James Taylor
+ * @author Juan F. Codagnone (replaced println with XmlWriterXdocSink)
+ * @version $Id$
+ * @componentx
+ */
+public class XmlWriterXdocSink
+extends SinkAdapter
+{
+private final XMLWriter writer;
+
+private StringBuffer buffer = new StringBuffer();
+
+private boolean headFlag;
+//private boolean itemFlag;
+private boolean verbatimFlag;
+private int[] cellJustif;
+private int cellCount;
+private int itemFlag;
+private boolean sectionTitleFlag;
+
+public XmlWriterXdocSink( XMLWriter writer)
+{
+if(writer == null) {
+throw new IllegalArgumentException("argument can't be null");
+}
+this.writer = writer;
+
+}
+
+protected void resetState()
+{
+headFlag = false;
+buffer = new StringBuffer();
+itemFlag = 0;
+verbatimFlag = false;
+cellJustif = null;
+cellCount = 0;
+sectionTitleFlag = false;
+}
+
+public void head()
+{
+resetState();
+
+headFlag = true;
+
+writer.startElement("document");
+writer.startElement("properties");
+}
+
+public void head_()
+{
+headFlag = false;
+
+writer.endElement(); // properties
+}
+
+public void title_()
+{
+if ( buffer.length() > 0 )
+{
+writer.startElement("title");
+content( buffer.toString() );
+writer.endElement(); // title
+buffer = new StringBuffer();
+}
+}
+
+public void author_()
+{
+if ( buffer.length() > 0 )
+{
+writer.startElement("author");
+content( buffer.toString() );
+writer.endElement(); // author
+buffer = new StringBuffer();
+}
+}
+
+public void date_()
+{
+if ( buffer.length() > 0 )
+{
+writer.startElement("date");
+content( buffer.toString() );
+writer.endElement();
+buffer = new StringBuffer();
+}
+}
+
+public void body()
+{
+writer.startElement("body");
+}
+
+public void body_()
+{
+writer.endElement(); // body
+
+writer.endElement(); // document
+
+resetState();
+}
+
+public void section1()
+{
+writer.startElement("section");
+}
+
+public void s
svn commit: r542283 - /maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Author: jvanzyl
Date: Mon May 28 10:57:47 2007
New Revision: 542283
URL: http://svn.apache.org/viewvc?view=rev&rev=542283
Log:
DOXIA-91: Make Doxia Decoration model to actually work in reactor build
Submitted by: Henning Schmiedehausen
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?view=diff&rev=542283&r1=542282&r2=542283
==
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Mon May 28 10:57:47 2007
@@ -19,6 +19,11 @@
* under the License.
*/
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.doxia.site.decoration.Banner;
import org.apache.maven.doxia.site.decoration.Body;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -26,32 +31,21 @@
import org.apache.maven.doxia.site.decoration.Logo;
import org.apache.maven.doxia.site.decoration.Menu;
import org.apache.maven.doxia.site.decoration.MenuItem;
-import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
/**
* Manage inheritance of the decoration model.
*
* @author mailto:[EMAIL PROTECTED]">Brett Porter
+ * @author mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen
* @plexus.component
role="org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler"
*/
-public class DefaultDecorationModelInheritanceAssembler
-implements DecorationModelInheritanceAssembler
+public class DefaultDecorationModelInheritanceAssembler implements
DecorationModelInheritanceAssembler
{
public void assembleModelInheritance( String name, DecorationModel child,
DecorationModel parent,
String childBaseUrl, String
parentBaseUrl )
{
-String prefix = getParentPrefix( parentBaseUrl, childBaseUrl );
-
-if ( !prefix.endsWith( "/" ) )
-{
-prefix += "/";
-}
+URLContainer urlContainer = new URLContainer( parentBaseUrl,
childBaseUrl );
// cannot inherit from null parent.
if ( parent != null )
@@ -59,15 +53,14 @@
if ( child.getBannerLeft() == null )
{
child.setBannerLeft( parent.getBannerLeft() );
-
-resolveBannerPaths( child.getBannerLeft(), prefix,
parentBaseUrl );
+resolveBannerPaths( child.getBannerLeft(), urlContainer );
}
if ( child.getBannerRight() == null )
{
child.setBannerRight( parent.getBannerRight() );
-resolveBannerPaths( child.getBannerRight(), prefix,
parentBaseUrl );
+resolveBannerPaths( child.getBannerRight(), urlContainer );
}
if ( child.getPublishDate() == null )
@@ -85,34 +78,33 @@
child.setSkin( parent.getSkin() );
}
-child.setPoweredBy(
-mergePoweredByLists( child.getPoweredBy(),
parent.getPoweredBy(), prefix, parentBaseUrl ) );
+child.setPoweredBy( mergePoweredByLists( child.getPoweredBy(),
parent.getPoweredBy(), urlContainer ) );
-assembleBodyInheritance( name, childBaseUrl, child, parent,
prefix, parentBaseUrl );
+assembleBodyInheritance( name, child, parent, urlContainer );
assembleCustomInheritance( child, parent );
}
}
-public void resolvePaths( DecorationModel decoration, String baseUrl )
+public void resolvePaths( final DecorationModel decoration, final String
childBaseUrl )
{
-String prefix = ".";
+URLContainer urlContainer = new URLContainer( null, childBaseUrl );
if ( decoration.getBannerLeft() != null )
{
-resolveBannerPaths( decoration.getBannerLeft(), prefix, baseUrl );
+resolveBannerPaths( decoration.getBannerLeft(), urlContainer );
}
if ( decoration.getBannerRight() != null )
{
-resolveBa
svn commit: r542284 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Author: jvanzyl
Date: Mon May 28 11:02:52 2007
New Revision: 542284
URL: http://svn.apache.org/viewvc?view=rev&rev=542284
Log:
DOXIA-78 Honor "rowspan" and "colspan" attributes for tables
Submitted by: Henning Schmiedehausen
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Modified:
maven/doxia/doxia/trunk/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/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?view=diff&rev=542284&r1=542283&r2=542284
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
Mon May 28 11:02:52 2007
@@ -212,11 +212,11 @@
}
else if ( parser.getName().equals( "th" ) )
{
-sink.tableHeaderCell();
+sink.tableHeaderCell(parser.getAttributeValue( null,
"colspan" ));
}
else if ( parser.getName().equals( "td" ) )
{
-sink.tableCell();
+sink.tableCell(parser.getAttributeValue( null, "colspan"
));
}
else
{
svn commit: r542285 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSink.java
Author: jvanzyl
Date: Mon May 28 11:03:52 2007
New Revision: 542285
URL: http://svn.apache.org/viewvc?view=rev&rev=542285
Log:
DOXIA-78 Honor "rowspan" and "colspan" attributes for tables
Submitted by: Henning Schmiedehausen
Modified:
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-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?view=diff&rev=542285&r1=542284&r2=542285
==
---
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
Mon May 28 11:03:52 2007
@@ -533,15 +533,15 @@
}
}
-String cellWidth = "width=\"" + width + "\"";
+String cellWidth = (width != null) ? " colspan=\"" + width + "\"" : "";
if ( headerRow )
{
-write( "
svn commit: r542363 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSink.java
Author: vsiveton
Date: Mon May 28 17:11:44 2007
New Revision: 542363
URL: http://svn.apache.org/viewvc?view=rev&rev=542363
Log:
DOXIA-113: Can't build doxia with jdk1.4 in rev 542303
Submitted by: Olivier Lamy
Reviewed by: Vincent Siveton
o patch applied
Modified:
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-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=542363&r1=542362&r2=542363
==
---
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
Mon May 28 17:11:44 2007
@@ -1,4 +1,4 @@
-package org.codehaus.doxia.module.xdoc;
+package org.apache.maven.doxia.module.xdoc;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,12 @@
* under the License.
*/
-import org.apache.maven.doxia.util.HtmlTools;
-import org.apache.maven.doxia.sink.SinkAdapter;
+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.HtmlTools;
+import org.apache.maven.doxia.util.StringUtil;
import org.codehaus.plexus.util.xml.XMLWriter;
-import org.apache.maven.doxia.parser.Parser;
/**
* A doxia Sink which produces an xdoc document.
@@ -54,7 +55,6 @@
throw new IllegalArgumentException("argument can't be null");
}
this.writer = writer;
-
}
protected void resetState()
@@ -81,8 +81,8 @@
public void head_()
{
headFlag = false;
-
-writer.endElement(); // properties
+
+writer.endElement(); // properties
}
public void title_()
@@ -402,7 +402,6 @@
}
}
-
writer.startElement("t" + ( headerRow ? 'h' : 'd' ));
if ( justif != null )
writer.addAttribute("align", justif);
@@ -535,7 +534,7 @@
{
buffer.append( text );
}
-else if ( sectionTitleFlag )
+else if ( sectionTitleFlag )
{
buffer.append( text );
}
@@ -564,7 +563,7 @@
protected void verbatimContent( String text )
{
-writer.writeText( text.replace(" ", " "));
+writer.writeText( StringUtil.replaceAll( text, " ", " " ) );
}
public static String escapeHTML( String text )
svn commit: r542365 - in /maven/doxia: doxia-sitetools/trunk/ doxia/trunk/doxia-modules/doxia-module-apt/ doxia/trunk/doxia-modules/doxia-module-fml/ doxia/trunk/doxia-modules/doxia-module-latex/ doxi
Author: vsiveton Date: Mon May 28 17:15:23 2007 New Revision: 542365 URL: http://svn.apache.org/viewvc?view=rev&rev=542365 Log: o ignored eclipse files and target Modified: maven/doxia/doxia-sitetools/trunk/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/ (props changed) maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/ (props changed) Propchange: maven/doxia/doxia-sitetools/trunk/ -- --- svn:ignore (added) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -0,0 +1 @@ +target Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project Propchange: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/ -- --- svn:ignore (original) +++ svn:ignore Mon May 28 17:15:23 2007 @@ -1 +1,3 @@ target +.classpath +.project
