You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/06/02 23:36:12 UTC
svn commit: r1345590 - in /maven/doxia/doxia/trunk: doxia-core/
doxia-core/src/main/java/org/apache/maven/doxia/
doxia-core/src/main/java/org/apache/maven/doxia/macro/
doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/
doxia-core/src/main/j...
Author: hboutemy
Date: Sat Jun 2 21:36:10 2012
New Revision: 1345590
URL: http://svn.apache.org/viewvc?rev=1345590&view=rev
Log:
[DOXIA-469] use plexus java 5 annotations instead of old-style javadoc annotations
Modified:
maven/doxia/doxia/trunk/doxia-core/pom.xml
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.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-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.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-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.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-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java
maven/doxia/doxia/trunk/doxia-modules/pom.xml
Modified: maven/doxia/doxia/trunk/doxia-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/pom.xml?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-core/pom.xml Sat Jun 2 21:36:10 2012
@@ -52,6 +52,10 @@ under the License.
<artifactId>plexus-container-default</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/DefaultDoxia.java Sat Jun 2 21:36:10 2012
@@ -26,6 +26,8 @@ import org.apache.maven.doxia.parser.man
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.io.Reader;
@@ -37,13 +39,13 @@ import java.io.Reader;
* @author Jason van Zyl
* @version $Id$
* @since 1.0
- * @plexus.component
*/
+@Component( role = Doxia.class )
public class DefaultDoxia
extends AbstractLogEnabled
implements Doxia
{
- /** @plexus.requirement */
+ @Requirement
private ParserManager parserManager;
// ----------------------------------------------------------------------
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/EchoMacro.java Sat Jun 2 21:36:10 2012
@@ -22,13 +22,14 @@ package org.apache.maven.doxia.macro;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.codehaus.plexus.component.annotations.Component;
/**
* A simple macro that prints out the key and value of some supplied parameters.
*
- * @plexus.component role-hint="echo"
* @version $Id$
*/
+@Component( role = Macro.class, hint = "echo" )
public class EchoMacro
extends AbstractMacro
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/SwfMacro.java Sat Jun 2 21:36:10 2012
@@ -20,18 +20,17 @@ package org.apache.maven.doxia.macro;
*/
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
/**
* Macro for embedding Flash (SWF) within Maven documentation.
*
- * @plexus.component role="org.apache.maven.doxia.macro.Macro"
- * role-hint="swf"
- *
* @author <a href="mailto:steve.motola@gmail.com">Steve Motola</a>
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
+@Component( role = Macro.class, hint = "swf" )
public class SwfMacro
extends AbstractMacro
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/manager/DefaultMacroManager.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.macro.man
*/
import org.apache.maven.doxia.macro.Macro;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.util.Map;
@@ -29,12 +31,12 @@ import java.util.Map;
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component
*/
+@Component( role = MacroManager.class )
public class DefaultMacroManager
implements MacroManager
{
- /** @plexus.requirement role="org.apache.maven.doxia.macro.Macro" */
+ @Requirement( role = Macro.class )
private Map<String, Macro> macros;
/** {@inheritDoc} */
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/snippet/SnippetMacro.java Sat Jun 2 21:36:10 2012
@@ -20,9 +20,11 @@ package org.apache.maven.doxia.macro.sni
*/
import org.apache.maven.doxia.macro.AbstractMacro;
+import org.apache.maven.doxia.macro.Macro;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
import java.io.IOException;
@@ -36,9 +38,9 @@ import org.apache.maven.doxia.sink.SinkE
/**
* A macro that prints out the content of a file or a URL.
*
- * @plexus.component role-hint="snippet"
* @version $Id$
*/
+@Component( role = Macro.class, hint = "snippet" )
public class SnippetMacro
extends AbstractMacro
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/macro/toc/TocMacro.java Sat Jun 2 21:36:10 2012
@@ -24,6 +24,7 @@ import java.io.StringReader;
import org.apache.maven.doxia.index.IndexEntry;
import org.apache.maven.doxia.index.IndexingSink;
import org.apache.maven.doxia.macro.AbstractMacro;
+import org.apache.maven.doxia.macro.Macro;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.util.HtmlTools;
@@ -31,6 +32,7 @@ import org.apache.maven.doxia.parser.Par
import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -72,11 +74,10 @@ import org.codehaus.plexus.util.StringUt
* </macro>
* </pre>
*
- * @plexus.component role-hint="toc"
- *
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
+@Component( role = Macro.class, hint = "toc" )
public class TocMacro
extends AbstractMacro
{
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/module/site/manager/DefaultSiteModuleManager.java Sat Jun 2 21:36:10 2012
@@ -24,6 +24,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
/**
* Simple implementation of the SiteModuleManager interface.
@@ -31,14 +33,12 @@ import org.apache.maven.doxia.module.sit
* @author Jason van Zyl
* @version $Id$
* @since 1.0
- * @plexus.component
*/
+@Component( role = SiteModuleManager.class )
public class DefaultSiteModuleManager
implements SiteModuleManager
{
- /**
- * @plexus.requirement role="org.apache.maven.doxia.module.site.SiteModule"
- */
+ @Requirement( role = SiteModule.class )
private Map<String, SiteModule> siteModules;
private Collection<SiteModule> siteModulesValues;
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/AbstractParser.java Sat Jun 2 21:36:10 2012
@@ -34,6 +34,8 @@ import org.apache.maven.doxia.macro.Macr
import org.apache.maven.doxia.macro.manager.MacroManager;
import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
/**
* An abstract base class that defines some convenience methods for parsers.
@@ -42,15 +44,15 @@ import org.apache.maven.doxia.sink.Sink;
* @author Jason van Zyl
* @version $Id$
* @since 1.0
- * @plexus.component
*/
+@Component( role = Parser.class )
public abstract class AbstractParser
implements Parser
{
/** Indicates that a second parsing is required. */
private boolean secondParsing = false;
- /** @plexus.requirement */
+ @Requirement
private MacroManager macroManager;
/** Log instance. */
Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/manager/DefaultParserManager.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.parser.ma
*/
import org.apache.maven.doxia.parser.Parser;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
import java.util.Map;
@@ -29,14 +31,12 @@ import java.util.Map;
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component
*/
+@Component( role = ParserManager.class )
public class DefaultParserManager
implements ParserManager
{
- /**
- * @plexus.requirement role="org.apache.maven.doxia.parser.Parser"
- */
+ @Requirement( role = Parser.class )
private Map<String, Parser> parsers;
/** {@inheritDoc} */
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=1345590&r1=1345589&r2=1345590&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 Jun 2 21:36:10 2012
@@ -24,12 +24,14 @@ import org.apache.maven.doxia.macro.Macr
import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
import org.apache.maven.doxia.parser.AbstractTextParser;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkAdapter;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.DoxiaUtils;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -50,8 +52,8 @@ import java.util.TreeSet;
*
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="apt"
*/
+@Component( role = Parser.class, hint = "apt" )
public class AptParser
extends AbstractTextParser
implements AptMarkup
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.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/AptSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractTextSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* APT implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="apt"
*/
+@Component( role = SinkFactory.class, hint = "apt" )
public class AptSinkFactory
extends AbstractTextSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.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/AptSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/main/java/org/apache/maven/doxia/module/apt/AptSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.ap
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>AptSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="apt"
*/
+@Component( role = SiteModule.class, hint = "apt" )
public class AptSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceParser.java Sat Jun 2 21:36:10 2012
@@ -35,9 +35,11 @@ import org.apache.maven.doxia.module.con
import org.apache.maven.doxia.module.confluence.parser.table.TableBlockParser;
import org.apache.maven.doxia.parser.AbstractTextParser;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.ByLineReaderSource;
import org.apache.maven.doxia.util.ByLineSource;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Parse the <a href="http://www.atlassian.com/software/confluence/">Confluence</a>.
@@ -46,8 +48,8 @@ import org.apache.maven.doxia.util.ByLin
*
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="confluence"
*/
+@Component( role = Parser.class, hint = "confluence" )
public class ConfluenceParser
extends AbstractTextParser
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractTextSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Confluence implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="confluence"
*/
+@Component( role = SinkFactory.class, hint = "confluence" )
public class ConfluenceSinkFactory
extends AbstractTextSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/main/java/org/apache/maven/doxia/module/confluence/ConfluenceSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.co
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>ConfluenceSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="confluence"
*/
+@Component( role = SiteModule.class, hint = "confluence" )
public class ConfluenceSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.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/DocBookParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookParser.java Sat Jun 2 21:36:10 2012
@@ -27,9 +27,11 @@ import java.util.Stack;
import org.apache.maven.doxia.macro.MacroExecutionException;
import org.apache.maven.doxia.markup.HtmlMarkup;
import org.apache.maven.doxia.parser.AbstractXmlParser;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -40,8 +42,8 @@ import org.codehaus.plexus.util.xml.pull
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="docbook"
*/
+@Component( role = Parser.class, hint = "docbook" )
public class DocBookParser
extends AbstractXmlParser
implements DocbookMarkup, SimplifiedDocbookMarkup
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.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/DocBookSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocBookSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.do
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>DocBookSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="docbook"
*/
+@Component( role = SiteModule.class, hint = "docbook" )
public class DocBookSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.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/DocbookSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/main/java/org/apache/maven/doxia/module/docbook/DocbookSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractXmlSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Docbook implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="docbook"
*/
+@Component( role = SinkFactory.class, hint = "docbook" )
public class DocbookSinkFactory
extends AbstractXmlSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlParser.java Sat Jun 2 21:36:10 2012
@@ -40,12 +40,14 @@ import org.apache.maven.doxia.module.fml
import org.apache.maven.doxia.module.fml.model.Part;
import org.apache.maven.doxia.parser.AbstractXmlParser;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.sink.XhtmlBaseSink;
import org.apache.maven.doxia.util.DoxiaUtils;
import org.apache.maven.doxia.util.HtmlTools;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@@ -58,8 +60,8 @@ import org.codehaus.plexus.util.xml.pull
* @author ltheussl
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="fml"
*/
+@Component( role = Parser.class, hint = "fml" )
public class FmlParser
extends AbstractXmlParser
implements FmlMarkup
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.fm
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>FmlSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="fml"
*/
+@Component( role = SiteModule.class, hint = "fml" )
public class FmlSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.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/FoSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractXmlSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* FO implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.1
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="fo"
*/
+@Component( role = SinkFactory.class, hint = "fo" )
public class FoSinkFactory
extends AbstractXmlSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractTextSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -32,8 +34,8 @@ import org.codehaus.plexus.util.xml.Pret
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="itext"
*/
+@Component( role = SinkFactory.class, hint = "itext" )
public class ITextSinkFactory
extends AbstractTextSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractTextSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Latex implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="latex"
*/
+@Component( role = SinkFactory.class, hint = "latex" )
public class LatexSinkFactory
extends AbstractTextSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownParser.java Sat Jun 2 21:36:10 2012
@@ -25,8 +25,10 @@ import java.io.StringReader;
import org.apache.maven.doxia.module.xhtml.XhtmlParser;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.pegdown.Extensions;
@@ -39,9 +41,9 @@ import org.pegdown.ast.RootNode;
* Defers parsing to the <a href="http://pegdown.org">PegDown library</a>.
*
* @author Julien Nicoulaud <ju...@gmail.com>
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="markdown"
* @since 1.3
*/
+@Component( role = Parser.class, hint="markdown" )
public class MarkdownParser
extends XhtmlParser
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-markdown/src/main/java/org/apache/maven/doxia/module/markdown/MarkdownSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,14 +20,16 @@ package org.apache.maven.doxia.module.ma
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* {@link org.apache.maven.doxia.module.site.SiteModule} for Markdown.
*
* @author Julien Nicoulaud <ju...@gmail.com>
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="markdown"
* @since 1.3
*/
+@Component( role = SiteModule.class, hint = "markdown" )
public class MarkdownSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/main/java/org/apache/maven/doxia/module/rtf/RtfSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -24,6 +24,8 @@ import java.io.OutputStream;
import org.apache.maven.doxia.sink.AbstractBinarySinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Rtf implementation of the Sink factory.
@@ -31,8 +33,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="rtf"
*/
+@Component( role = SinkFactory.class, hint = "rtf" )
public class RtfSinkFactory
extends AbstractBinarySinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiParser.java Sat Jun 2 21:36:10 2012
@@ -33,9 +33,11 @@ import org.apache.maven.doxia.module.twi
import org.apache.maven.doxia.module.twiki.parser.XHTMLWikiWordLinkResolver;
import org.apache.maven.doxia.parser.AbstractTextParser;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.ByLineReaderSource;
import org.apache.maven.doxia.util.ByLineSource;
+import org.codehaus.plexus.component.annotations.Component;
import java.io.Reader;
import java.util.ArrayList;
@@ -48,8 +50,8 @@ import java.util.List;
* @author Juan F. Codagnone
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="twiki"
*/
+@Component( role = Parser.class, hint = "twiki" )
public class TWikiParser
extends AbstractTextParser
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractTextSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* TWiki implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="twiki"
*/
+@Component( role = SinkFactory.class, hint = "twiki" )
public class TWikiSinkFactory
extends AbstractTextSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/main/java/org/apache/maven/doxia/module/twiki/TWikiSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.tw
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>TWikiSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author Juan F. Codagnone
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="twiki"
*/
+@Component( role = SiteModule.class, hint = "twiki" )
public class TWikiSiteModule
extends AbstractSiteModule
{
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?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- 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 Sat Jun 2 21:36:10 2012
@@ -32,11 +32,13 @@ import org.apache.maven.doxia.macro.Macr
import org.apache.maven.doxia.macro.manager.MacroNotFoundException;
import org.apache.maven.doxia.macro.MacroRequest;
import org.apache.maven.doxia.parser.ParseException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.XhtmlBaseParser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
import org.apache.maven.doxia.util.HtmlTools;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
@@ -48,8 +50,8 @@ import org.codehaus.plexus.util.xml.pull
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="xdoc"
*/
+@Component( role = Parser.class, hint = "xdoc" )
public class XdocParser
extends XhtmlBaseParser
implements XdocMarkup
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.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/XdocSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractXmlSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Xdoc implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="xdoc"
*/
+@Component( role = SinkFactory.class, hint = "xdoc" )
public class XdocSinkFactory
extends AbstractXmlSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.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/XdocSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.xd
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>XdocSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="xdoc"
*/
+@Component( role = SiteModule.class, hint = "xdoc" )
public class XdocSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.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/XhtmlParser.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlParser.java Sat Jun 2 21:36:10 2012
@@ -22,10 +22,12 @@ package org.apache.maven.doxia.module.xh
import javax.swing.text.html.HTML.Attribute;
import org.apache.maven.doxia.macro.MacroExecutionException;
+import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.XhtmlBaseParser;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.xml.pull.XmlPullParser;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -35,8 +37,8 @@ import org.codehaus.plexus.util.xml.pull
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="xhtml"
*/
+@Component( role = Parser.class, hint = "xhtml" )
public class XhtmlParser
extends XhtmlBaseParser
implements XhtmlMarkup
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.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/XhtmlSinkFactory.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkFactory.java Sat Jun 2 21:36:10 2012
@@ -23,6 +23,8 @@ import java.io.Writer;
import org.apache.maven.doxia.sink.AbstractXmlSinkFactory;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkFactory;
+import org.codehaus.plexus.component.annotations.Component;
/**
* Xhtml implementation of the Sink factory.
@@ -30,8 +32,8 @@ import org.apache.maven.doxia.sink.Sink;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.sink.SinkFactory" role-hint="xhtml"
*/
+@Component( role = SinkFactory.class, hint = "xhtml" )
public class XhtmlSinkFactory
extends AbstractXmlSinkFactory
{
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.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/XhtmlSiteModule.java?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/main/java/org/apache/maven/doxia/module/xhtml/XhtmlSiteModule.java Sat Jun 2 21:36:10 2012
@@ -20,6 +20,8 @@ package org.apache.maven.doxia.module.xh
*/
import org.apache.maven.doxia.module.site.AbstractSiteModule;
+import org.apache.maven.doxia.module.site.SiteModule;
+import org.codehaus.plexus.component.annotations.Component;
/**
* <p>XhtmlSiteModule class.</p>
@@ -27,8 +29,8 @@ import org.apache.maven.doxia.module.sit
* @author ltheussl
* @version $Id$
* @since 1.0
- * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="xhtml"
*/
+@Component( role = SiteModule.class, hint = "xhtml" )
public class XhtmlSiteModule
extends AbstractSiteModule
{
Modified: maven/doxia/doxia/trunk/doxia-modules/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/pom.xml?rev=1345590&r1=1345589&r2=1345590&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/pom.xml Sat Jun 2 21:36:10 2012
@@ -59,6 +59,10 @@ under the License.
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-annotations</artifactId>
+ </dependency>
<!-- test -->
<dependency>