Author: evenisse
Date: Wed Jul 19 09:34:10 2006
New Revision: 423516
URL: http://svn.apache.org/viewvc?rev=423516&view=rev
Log:
o load all pluginRelocators with plexus
o auto-generate components.xml
Removed:
maven/components/trunk/maven-model-converter/src/main/resources/
Modified:
maven/components/trunk/maven-model-converter/pom.xml
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V3PomRewriter.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V4PomRewriter.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java
Modified: maven/components/trunk/maven-model-converter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/pom.xml?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
--- maven/components/trunk/maven-model-converter/pom.xml (original)
+++ maven/components/trunk/maven-model-converter/pom.xml Wed Jul 19 09:34:10
2006
@@ -52,4 +52,19 @@
<version>1.4</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/Maven1Converter.java
Wed Jul 19 09:34:10 2006
@@ -17,17 +17,6 @@
*/
import org.apache.maven.model.Model;
-import org.apache.maven.model.converter.plugins.PCCChangelog;
-import org.apache.maven.model.converter.plugins.PCCChanges;
-import org.apache.maven.model.converter.plugins.PCCCheckstyle;
-import org.apache.maven.model.converter.plugins.PCCCompiler;
-import org.apache.maven.model.converter.plugins.PCCJar;
-import org.apache.maven.model.converter.plugins.PCCJavadoc;
-import org.apache.maven.model.converter.plugins.PCCMultiproject;
-import org.apache.maven.model.converter.plugins.PCCPmd;
-import org.apache.maven.model.converter.plugins.PCCSurefire;
-import org.apache.maven.model.converter.plugins.PCCTaglist;
-import org.apache.maven.model.converter.plugins.PCCWar;
import org.apache.maven.model.converter.plugins.PluginConfigurationConverter;
import org.apache.maven.model.converter.relocators.PluginRelocator;
import org.apache.maven.model.converter.relocators.PluginRelocatorManager;
@@ -48,6 +37,7 @@
import java.io.Writer;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
/**
@@ -56,6 +46,7 @@
* @author Fabrizio Giustina
* @author Dennis Lundberg
* @version $Id$
+ * @plexus.component role="org.apache.maven.model.converter.Maven1Converter"
*/
public class Maven1Converter
extends AbstractLogEnabled
@@ -64,10 +55,10 @@
/**
* Available converters for specific plugin configurations
+ *
+ * @plexus.requirement
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
*/
- private PluginConfigurationConverter[] converters = new
PluginConfigurationConverter[]{new PCCChangelog(),
- new PCCChanges(), new PCCCheckstyle(), new PCCCompiler(), new
PCCJar(), new PCCJavadoc(), new PCCMultiproject(),
- new PCCPmd(), new PCCSurefire(), new PCCTaglist(), new PCCWar()};
+ private List converters;
/**
* Plexus component that manages plugin relocators
@@ -120,9 +111,10 @@
loadProperties( properties, new File( basedir, "project.properties" )
);
- for ( int j = 0; j < converters.length; j++ )
+ for ( Iterator i = converters.iterator(); i.hasNext(); )
{
- converters[j].convertConfiguration( v4Model, v3Model, properties );
+ PluginConfigurationConverter converter =
(PluginConfigurationConverter) i.next();
+ converter.convertConfiguration( v4Model, v3Model, properties );
}
// @todo Should this be run before or after the configuration
converters?
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
Wed Jul 19 09:34:10 2006
@@ -44,6 +44,7 @@
/**
* @author jdcasey
+ * @plexus.component role="org.apache.maven.model.converter.ModelConverter"
*/
public class PomV3ToV4Translator
implements ModelConverter
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V3PomRewriter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V3PomRewriter.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V3PomRewriter.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V3PomRewriter.java
Wed Jul 19 09:34:10 2006
@@ -30,10 +30,14 @@
/**
* @author jdcasey
+ * @plexus.component
role="org.apache.maven.model.converter.ArtifactPomRewriter" role-hint="v3"
*/
public class V3PomRewriter
implements ArtifactPomRewriter
{
+ /**
+ * @plexus.requirement
+ */
private ModelConverter translator;
public void rewrite( Reader from, Writer to, boolean reportOnly, String
groupId, String artifactId, String version,
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V4PomRewriter.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V4PomRewriter.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V4PomRewriter.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/V4PomRewriter.java
Wed Jul 19 09:34:10 2006
@@ -22,15 +22,18 @@
import java.io.Reader;
import java.io.Writer;
-import java.util.ArrayList;
import java.util.List;
/**
* @author jdcasey
+ * @plexus.component
role="org.apache.maven.model.converter.ArtifactPomRewriter" role-hint="v4"
*/
public class V4PomRewriter
implements ArtifactPomRewriter
{
+ /**
+ * @plexus.requirement
+ */
private ModelConverter translator;
public void rewrite( Reader from, Writer to, boolean reportOnly, String
groupId, String artifactId, String version,
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChangelog.java
Wed Jul 19 09:34:10 2006
@@ -24,6 +24,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-changelog-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="changelog"
+ *
* @author Dennis Lundberg
* @version $Id: PCCChangelog.java 409264 2006-05-24 23:13:13 +0000 (on, 24
maj 2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCChanges.java
Wed Jul 19 09:34:10 2006
@@ -24,6 +24,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-changes-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="changes"
+ *
* @author Dennis Lundberg
* @version $Id: PCCChanges.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj
2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCheckstyle.java
Wed Jul 19 09:34:10 2006
@@ -24,6 +24,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-checkstyle-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="checkstyle"
+ *
* @author Dennis Lundberg
* @version $Id: PCCCheckstyle.java 409264 2006-05-24 23:13:13 +0000 (on, 24
maj 2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCCompiler.java
Wed Jul 19 09:34:10 2006
@@ -22,6 +22,8 @@
import java.util.Properties;
/**
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="compiler"
+ *
* @author Fabrizio Giustina
* @author Dennis Lundberg
* @version $Id$
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJar.java
Wed Jul 19 09:34:10 2006
@@ -25,6 +25,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-jar-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="jar"
+ *
* @author Dennis Lundberg
* @version $Id: PCCJar.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj
2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCJavadoc.java
Wed Jul 19 09:34:10 2006
@@ -25,6 +25,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-javadoc-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="javadoc"
+ *
* @author Dennis Lundberg
* @version $Id: PCCJavadoc.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj
2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCMultiproject.java
Wed Jul 19 09:34:10 2006
@@ -22,6 +22,8 @@
import java.util.Properties;
/**
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="multiproject"
+ *
* @author Fabrizio Giustina
* @version $Id$
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCPmd.java
Wed Jul 19 09:34:10 2006
@@ -25,6 +25,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-pmd-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="pmd"
+ *
* @author Dennis Lundberg
* @version $Id: PCCPmd.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj
2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCSurefire.java
Wed Jul 19 09:34:10 2006
@@ -25,6 +25,8 @@
import java.util.StringTokenizer;
/**
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="surefire"
+ *
* @author Fabrizio Giustina
* @author Dennis Lundberg
* @version $Id$
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
Wed Jul 19 09:34:10 2006
@@ -24,6 +24,8 @@
/**
* A <code>PluginConfigurationConverter</code> for the maven-tasklist-plugin.
*
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="taglist"
+ *
* @author Dennis Lundberg
* @version $Id: PCCTaglist.java 409264 2006-05-24 23:13:13 +0000 (on, 24 maj
2006) carlos $
*/
Modified:
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java?rev=423516&r1=423515&r2=423516&view=diff
==============================================================================
---
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java
(original)
+++
maven/components/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCWar.java
Wed Jul 19 09:34:10 2006
@@ -23,6 +23,8 @@
import java.util.Properties;
/**
+ * @plexus.component
role="org.apache.maven.model.converter.plugins.PluginConfigurationConverter"
role-hint="war"
+ *
* @author Fabrizio Giustina
* @author Dennis Lundberg
* @version $Id$
