maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1345596 - in /maven/doxia/doxia-tools/trunk: ./ doxia-book-renderer/ doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/ doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/ doxia-book-renderer/src/mai...
Date Sat, 02 Jun 2012 22:10:16 GMT
Author: hboutemy
Date: Sat Jun  2 22:10:15 2012
New Revision: 1345596

URL: http://svn.apache.org/viewvc?rev=1345596&view=rev
Log:
[DOXIATOOLS-37] use plexus java 5 annotations instead of old-style javadoc annotations

Modified:
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
    maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java
    maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
    maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
    maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
    maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/DefaultLinkCheck.java
    maven/doxia/doxia-tools/trunk/pom.xml

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/pom.xml Sat Jun  2 22:10:15 2012
@@ -96,6 +96,10 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
 
     <!-- test -->
     <dependency>

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/DefaultBookDoxia.java
Sat Jun  2 22:10:15 2012
@@ -26,6 +26,8 @@ import org.apache.maven.doxia.book.servi
 import org.apache.maven.doxia.book.services.renderer.BookRenderer;
 import org.apache.maven.doxia.book.services.validation.BookValidator;
 import org.apache.maven.doxia.book.services.validation.ValidationResult;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.io.File;
@@ -40,30 +42,22 @@ import java.util.Set;
  *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
- * @plexus.component
  */
+@Component( role = BookDoxia.class )
 public class DefaultBookDoxia
     extends AbstractLogEnabled
     implements BookDoxia
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BookIo bookIo;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BookValidator bookValidator;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private BookIndexer bookIndexer;
 
-    /**
-     * @plexus.requirement role="org.apache.maven.doxia.book.services.renderer.BookRenderer"
-     */
+    @Requirement( role = BookRenderer.class )
     private Map<String, BookRenderer> bookRenderers;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/indexer/DefaultBookIndexer.java
Sat Jun  2 22:10:15 2012
@@ -33,23 +33,22 @@ import org.apache.maven.doxia.index.Inde
 import org.apache.maven.doxia.index.IndexingSink;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 /**
  * Default implementation of BookIndexer.
  *
- * @plexus.component
- *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
+@Component( role = BookIndexer.class )
 public class DefaultBookIndexer
     extends AbstractLogEnabled
     implements BookIndexer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/io/DefaultBookIo.java
Sat Jun  2 22:10:15 2012
@@ -28,6 +28,8 @@ import org.apache.maven.doxia.module.sit
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.io.IOException;
@@ -41,17 +43,15 @@ import java.util.List;
 /**
  * <p>DefaultBookIo class.</p>
  *
- * @plexus.component
  * @author <a href="mailto:trygve.laugstol@objectware.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
+@Component( role = BookIo.class )
 public class DefaultBookIo
     extends AbstractLogEnabled
     implements BookIo
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private SiteModuleManager siteModuleManager;
 
     // -----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/AbstractITextBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -37,6 +37,7 @@ import org.apache.maven.doxia.module.ite
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
 import org.apache.maven.doxia.sink.Sink;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -55,9 +56,7 @@ public abstract class AbstractITextBookR
     extends AbstractLogEnabled
     implements BookRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/DocbookBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -35,6 +35,8 @@ import org.apache.maven.doxia.book.servi
 import org.apache.maven.doxia.parser.ParseException;
 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 org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -44,17 +46,15 @@ import org.codehaus.plexus.util.WriterFa
 /**
  * An implementation of <code>BookRenderer</code> for docbook
  *
- * @plexus.component role-hint="doc-book"
  * @author Eric Redmond
  * @version $Id$
  */
+@Component( role = BookRenderer.class, hint = "doc-book" )
 public class DocbookBookRenderer
     extends AbstractLogEnabled
     implements BookRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/LatexBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -28,6 +28,8 @@ import org.apache.maven.doxia.book.model
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.Doxia;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -46,16 +48,14 @@ import java.util.HashMap;
 /**
  * <p>LatexBookRenderer class.</p>
  *
- * @plexus.component role-hint="latex"
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
+@Component( role = BookRenderer.class, hint = "latex" )
 public class LatexBookRenderer
     implements BookRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/PdfBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -25,15 +25,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.maven.doxia.module.itext.ITextUtil;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * PDF book renderer with the <code>iText</code> framework.
  *
- * @plexus.component role-hint="pdf"
- *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
  */
+@Component( role = BookRenderer.class, hint = "pdf" )
 public class PdfBookRenderer
     extends AbstractITextBookRenderer
 {

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/RtfBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -25,15 +25,15 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 
 import org.apache.maven.doxia.module.itext.ITextUtil;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * RTF book renderer with the <code>iText</code> framework.
  *
- * @plexus.component role-hint="rtf"
- *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
  */
+@Component( role = BookRenderer.class, hint = "rtf" )
 public class RtfBookRenderer
     extends AbstractITextBookRenderer
 {

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XHtmlBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -29,6 +29,8 @@ import org.apache.maven.doxia.book.servi
 import org.apache.maven.doxia.sink.render.RenderingContext;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
 import org.apache.maven.doxia.parser.ParseException;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -43,17 +45,15 @@ import java.io.Writer;
 /**
  * <p>XHtmlBookRenderer class.</p>
  *
- * @plexus.component role-hint="xhtml"
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
+@Component( role = BookRenderer.class, hint = "xhtml" )
 public class XHtmlBookRenderer
     extends AbstractLogEnabled
     implements BookRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/renderer/XdocBookRenderer.java
Sat Jun  2 22:10:15 2012
@@ -41,6 +41,8 @@ import org.apache.maven.doxia.module.xdo
 import org.apache.maven.doxia.parser.ParseException;
 import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
 import org.apache.maven.doxia.util.HtmlTools;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
@@ -54,20 +56,16 @@ import org.codehaus.plexus.util.WriterFa
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
- * @plexus.component role-hint="xdoc"
  */
+@Component( role = BookRenderer.class, hint = "xdoc" )
 public class XdocBookRenderer
     extends AbstractLogEnabled
     implements BookRenderer
 {
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private Doxia doxia;
 
-    /**
-     * @plexus.requirement
-     */
+    @Requirement
     private I18N i18n;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-book-renderer/src/main/java/org/apache/maven/doxia/book/services/validation/DefaultBookValidator.java
Sat Jun  2 22:10:15 2012
@@ -19,6 +19,7 @@ package org.apache.maven.doxia.book.serv
  * under the License.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.StringUtils;
 import org.apache.maven.doxia.book.model.BookModel;
@@ -27,11 +28,10 @@ import org.apache.maven.doxia.book.model
 /**
  * Default implementation of BookValidator.
  *
- * @plexus.component
- *
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @version $Id$
  */
+@Component( role = BookValidator.class )
 public class DefaultBookValidator
     extends AbstractLogEnabled
     implements BookValidator

Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/pom.xml Sat Jun  2 22:10:15 2012
@@ -133,6 +133,10 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-interpolation</artifactId>
       <version>1.14</version>
     </dependency>

Modified: maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Sat Jun  2 22:10:15 2012
@@ -62,6 +62,8 @@ import org.apache.maven.project.MavenPro
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.reporting.MavenReport;
 
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.util.IOUtil;
@@ -79,9 +81,8 @@ import org.codehaus.plexus.util.xml.pull
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
- *
- * @plexus.component role="org.apache.maven.doxia.tools.SiteTool" role-hint="default"
  */
+@Component( role = SiteTool.class )
 public class DefaultSiteTool
     extends AbstractLogEnabled
     implements SiteTool
@@ -92,37 +93,32 @@ public class DefaultSiteTool
 
     /**
      * The component that is used to resolve additional artifacts required.
-     *
-     * @plexus.requirement
      */
+    @Requirement
     private ArtifactResolver artifactResolver;
 
     /**
      * The component used for creating artifact instances.
-     *
-     * @plexus.requirement
      */
+    @Requirement
     private ArtifactFactory artifactFactory;
 
     /**
      * Internationalization.
-     *
-     * @plexus.requirement
      */
+    @Requirement
     protected I18N i18n;
 
     /**
      * The component for assembling inheritance.
-     *
-     * @plexus.requirement
      */
+    @Requirement
     protected DecorationModelInheritanceAssembler assembler;
 
     /**
      * Project builder.
-     *
-     * @plexus.requirement
      */
+    @Requirement
     protected MavenProjectBuilder mavenProjectBuilder;
 
     // ----------------------------------------------------------------------

Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/pom.xml Sat Jun  2 22:10:15 2012
@@ -62,6 +62,10 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

Modified: maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/DefaultLinkCheck.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/DefaultLinkCheck.java?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/DefaultLinkCheck.java
(original)
+++ maven/doxia/doxia-tools/trunk/doxia-linkcheck/src/main/java/org/apache/maven/doxia/linkcheck/DefaultLinkCheck.java
Sat Jun  2 22:10:15 2012
@@ -45,6 +45,7 @@ import org.apache.maven.doxia.linkcheck.
 import org.apache.maven.doxia.linkcheck.validation.OfflineHTTPLinkValidator;
 import org.apache.maven.doxia.linkcheck.validation.OnlineHTTPLinkValidator;
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
@@ -59,9 +60,8 @@ import org.codehaus.plexus.util.WriterFa
  * @author <a href="mailto:aheritier@apache.org">Arnaud Heritier</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
- *
- * @plexus.component role="org.apache.maven.doxia.linkcheck.LinkCheck" role-hint="default"
  */
+@Component( role = LinkCheck.class )
 public final class DefaultLinkCheck
     implements LinkCheck
 {

Modified: maven/doxia/doxia-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/pom.xml?rev=1345596&r1=1345595&r2=1345596&view=diff
==============================================================================
--- maven/doxia/doxia-tools/trunk/pom.xml (original)
+++ maven/doxia/doxia-tools/trunk/pom.xml Sat Jun  2 22:10:15 2012
@@ -198,6 +198,11 @@ under the License.
         <artifactId>plexus-utils</artifactId>
         <version>2.0.5</version>
       </dependency>
+      <dependency><!-- remove when upgrading parent to version 22 -->
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-annotations</artifactId>
+        <version>1.5.5</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
@@ -219,12 +224,6 @@ under the License.
             <tagBase>https://svn.apache.org/repos/asf/maven/doxia/doxia-tools/tags</tagBase>
           </configuration>
         </plugin>
-        <!-- TODO need to upgrade to last version or Maven parent version -->
-        <plugin>
-          <groupId>org.codehaus.plexus</groupId>
-          <artifactId>plexus-maven-plugin</artifactId>
-          <version>1.3.5</version>
-        </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
@@ -236,11 +235,11 @@ under the License.
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-maven-plugin</artifactId>
+        <artifactId>plexus-component-metadata</artifactId>
         <executions>
           <execution>
             <goals>
-              <goal>descriptor</goal>
+              <goal>generate-metadata</goal>
             </goals>
           </execution>
         </executions>



Mime
View raw message