svn commit: r733389 - /maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Author: ltheussl
Date: Sat Jan 10 14:38:36 2009
New Revision: 733389
URL: http://svn.apache.org/viewvc?rev=733389&view=rev
Log:
Fix comment parsing when comments are not separated by empty lines (ie separate
blocks).
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java?rev=733389&r1=733388&r2=733389&view=diff
==
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
Sat Jan 10 14:38:36 2009
@@ -1610,6 +1610,13 @@
AptParser.this.nextLine();
break;
}
+else if ( ( AptParser.charAt( l, length, i ) == COMMENT
+&& AptParser.charAt( l, length, i + 1 ) == COMMENT
)
+|| type == COMMENT_BLOCK )
+{
+// parse comments as separate blocks line by line
+break;
+}
buffer.append( EOL );
buffer.append( l );
svn commit: r733390 - in /maven/doxia: doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ doxia/trunk/doxia-core/src/main/java/org/apache/ma
Author: ltheussl
Date: Sat Jan 10 14:40:32 2009
New Revision: 733390
URL: http://svn.apache.org/viewvc?rev=733390&view=rev
Log:
Javadocs, minor code formatting.
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractTextSinkFactory.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkFactory.java
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.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/DecorationModelInheritanceAssembler.java?rev=733390&r1=733389&r2=733390&view=diff
==
---
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
Sat Jan 10 14:40:32 2009
@@ -28,10 +28,28 @@
*/
public interface DecorationModelInheritanceAssembler
{
+/**
+ * Plexus lookup role.
+ */
String ROLE = DecorationModelInheritanceAssembler.class.getName();
+/**
+ * Manage inheritance of the decoration model between a parent and child.
+ *
+ * @param name a name.
+ * @param child the child DecorationModel.
+ * @param parent the parent DecorationModel.
+ * @param childBaseUrl the child nase URL.
+ * @param parentBaseUrl the parent base URL.
+ */
void assembleModelInheritance( String name, DecorationModel child,
DecorationModel parent, String childBaseUrl,
String parentBaseUrl );
+/**
+ * Resolve relative paths for a DecorationModel given a base URL.
+ *
+ * @param decoration the DecorationModel.
+ * @param baseUrl the base URL.
+ */
void resolvePaths( DecorationModel decoration, String baseUrl );
}
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?rev=733390&r1=733389&r2=733390&view=diff
==
---
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
Sat Jan 10 14:40:32 2009
@@ -42,6 +42,7 @@
*/
public class DefaultDecorationModelInheritanceAssembler implements
DecorationModelInheritanceAssembler
{
+/** {...@inheritdoc} */
public void assembleModelInheritance( String name, DecorationModel child,
DecorationModel parent,
String childBaseUrl, String
parentBaseUrl )
{
@@ -86,9 +87,10 @@
}
}
-public void resolvePaths( final DecorationModel decoration, final String
childBaseUrl )
+/** {...@inheritdoc} */
+public void resolvePaths( final DecorationModel decoration, final String
baseUrl )
{
-URLContainer urlContainer = new URLContainer( null, childBaseUrl );
+URLContainer urlContainer = new URLContainer( null, baseUrl );
if ( decoration.getBannerLeft() != null )
{
@@ -137,8 +139,7 @@
* to the oldBaseUrl, these are changed to the newBannerUrl.
*
* @param banner
- * @param prefix
- * @param baseUrl
+ * @param urlContainer
*/
private void resolveBannerPaths( final Banner banner, final URLContainer
urlContainer )
{
@@ -149,7 +150,7 @@
}
}
-private void assembleCustomInheritance( DecorationModel child,
DecorationModel parent )
+private void as
svn commit: r733391 - in /maven/doxia/site/src/site/apt/references: apt-format.apt doxia-apt.apt
Author: ltheussl
Date: Sat Jan 10 14:42:21 2009
New Revision: 733391
URL: http://svn.apache.org/viewvc?rev=733391&view=rev
Log:
Document differences in apt format for new doxia versions
Modified:
maven/doxia/site/src/site/apt/references/apt-format.apt
maven/doxia/site/src/site/apt/references/doxia-apt.apt
Modified: maven/doxia/site/src/site/apt/references/apt-format.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/references/apt-format.apt?rev=733391&r1=733390&r2=733391&view=diff
==
--- maven/doxia/site/src/site/apt/references/apt-format.apt (original)
+++ maven/doxia/site/src/site/apt/references/apt-format.apt Sat Jan 10 14:42:21
2009
@@ -18,7 +18,7 @@
The information contained in this document corresponds to the
original
{{{http://www.xmlmind.com/_aptconvert/docs/userguidetoc.html}APT}}
format as published by {{{http://www.xmlmind.com/}Xmlmind}}.
- Maven Doxia has applied several modifications to this original
+ In version 1.1 Maven Doxia has applied several modifications to this
original
format, see this separate {{{./doxia-apt.html}document}}
for a detailed description. Notable differences are highlighted below
with a {{{./doxia-apt.html}\[Change\]}} link.
Modified: maven/doxia/site/src/site/apt/references/doxia-apt.apt
URL:
http://svn.apache.org/viewvc/maven/doxia/site/src/site/apt/references/doxia-apt.apt?rev=733391&r1=733390&r2=733391&view=diff
==
--- maven/doxia/site/src/site/apt/references/doxia-apt.apt (original)
+++ maven/doxia/site/src/site/apt/references/doxia-apt.apt Sat Jan 10 14:42:21
2009
@@ -8,8 +8,11 @@
~~
In the following we provide a list of differences/enhancements to the
- original {{{./apt-format.html}APT}} format that were incorporated in
- Doxia. Apart from some exceptions, these differences are usually
+ original {{{./apt-format.html}APT}} format that were incorporated in Doxia.
+ Note that the original specification still applies to <>
+ (used e.g. by Maven-2.0.x), the changes outlined here only apply from
+ <> (used by Maven >= 2.1.x).
+ Apart from some exceptions, these differences are usually
'backwards-compatible', i.e. any document that gets correctly processed
by {{{http://www.xmlmind.com/aptconvert.html}Aptconvert}} should also
be a valid Doxia input file and lead to identical results when processed
svn commit: r733395 - in /maven/doxia/doxia/trunk: doxia-core/src/main/java/org/apache/maven/doxia/macro/ doxia-core/src/main/java/org/apache/maven/doxia/sink/ doxia-core/src/main/java/org/apache/mave
Author: ltheussl
Date: Sat Jan 10 15:09:40 2009
New Revision: 733395
URL: http://svn.apache.org/viewvc?rev=733395&view=rev
Log:
Update javadoc since's to new version, 1.0-beta-1 won't be released.
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/util/DoxiaUtils.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkEventElement.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/SinkEventTestingSink.java
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/XhtmlBaseSinkTest.java
maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/Log.java
maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/LogEnabled.java
maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/PlexusLoggerWrapper.java
maven/doxia/doxia/trunk/doxia-logging-api/src/main/java/org/apache/maven/doxia/logging/SystemStreamLog.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptUtils.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-sink-api/src/main/java/org/apache/maven/doxia/sink/Sink.java
maven/doxia/doxia/trunk/doxia-sink-api/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributes.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java?rev=733395&r1=733394&r2=733395&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/AbstractMacro.java
Sat Jan 10 15:09:40 2009
@@ -64,7 +64,7 @@
*
* @param paramName The name of the parameter to check.
* @param paramValue The parameter value.
- * @since 1.0-beta-1
+ * @since 1.1
*/
protected void required( String paramName, String paramValue )
{
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java?rev=733395&r1=733394&r2=733395&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/AbstractSink.java
Sat Jan 10 15:09:40 2009
@@ -29,7 +29,7 @@
* @author ltheussl
* @author mailto:vincent.sive...@gmail.com";>Vincent Siveton
* @version $Id$
- * @since 1.0-beta-1
+ * @since 1.1
*/
public abstract class AbstractSink
implements Sink, Markup
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java?rev=733395&r1=733394&r2=733395&view=diff
==
---
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkEventAttributeSet.java
Sat Jan 10 15:09:40 2009
@@ -30,7 +30,7 @@
*
* @author ltheussl
* @version $Id$
- * @since 1.0-beta-1
+ * @since 1.1
*/
public class SinkEventAttributeSet
implements SinkEventAttributes
Modified:
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/sink/SinkUtils.java?rev=733395&r1=733394&r2=733395&view=diff
==
-
