replace most handwritten components.xml with annotations

fixes #275

Author: hboutemy

modello-core/pom.xml

@@ -48,6 +48,17 @@
           </archive>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>merge-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java

@@ -40,6 +40,8 @@
 import org.codehaus.modello.model.ModelInterface;
 import org.codehaus.modello.model.ModelValidationException;
 import org.codehaus.modello.plugin.ModelloGenerator;
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.ReaderFactory;
 
 import java.io.File;
@@ -55,17 +57,14 @@
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  */
+@Component( role = ModelloCore.class )
 public class DefaultModelloCore
     extends AbstractModelloCore
 {
-    /**
-     * @requirement
-     */
+    @Requirement
     private MetadataPluginManager metadataPluginManager;
 
-    /**
-     * @requirement
-     */
+    @Requirement
     private GeneratorPluginManager generatorPluginManager;
 
     public MetadataPluginManager getMetadataPluginManager()

modello-core/src/main/java/org/codehaus/modello/plugin/AbstractPluginManager.java

@@ -23,6 +23,7 @@
  */
 
 import org.codehaus.modello.ModelloRuntimeException;
+
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 

modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java

@@ -34,12 +34,14 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.util.Map;
 
 /**
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  */
+@Component( role = MetadataPlugin.class, hint = "model" )
 public class ModelMetadataPlugin
     extends AbstractMetadataPlugin
     implements MetadataPlugin

modello-core/src/main/resources/META-INF/plexus/components.xml

@@ -1,18 +1,5 @@
 <component-set>
   <components>
-    <component>
-      <role>org.codehaus.modello.core.ModelloCore</role>
-      <implementation>org.codehaus.modello.core.DefaultModelloCore</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.modello.core.MetadataPluginManager</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.modello.core.GeneratorPluginManager</role>
-        </requirement>
-      </requirements>
-    </component>
     <component>
       <role>org.codehaus.modello.core.MetadataPluginManager</role>
       <implementation>org.codehaus.modello.core.DefaultMetadataPluginManager</implementation>
@@ -35,11 +22,5 @@
         </requirement>
       </requirements>
     </component>
-
-    <component>
-      <role>org.codehaus.modello.metadata.MetadataPlugin</role>
-      <role-hint>model</role-hint>
-      <implementation>org.codehaus.modello.plugin.model.ModelMetadataPlugin</implementation>
-    </component>
   </components>
 </component-set>

modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java

@@ -32,6 +32,7 @@
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.Version;
 import org.codehaus.modello.model.VersionDefinition;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.AbstractJavaModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JInterface;
@@ -43,6 +44,7 @@
 import org.codehaus.modello.plugin.java.javasource.JType;
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.IOUtil;
 
 import java.io.IOException;
@@ -54,6 +56,7 @@
 /**
  * Generate a basic conversion class between two versions of a model.
  */
+@Component( role = ModelloGenerator.class, hint = "converters" )
 public class ConverterGenerator
     extends AbstractJavaModelloGenerator
 {

modello-plugins/modello-plugin-converters/src/main/resources/META-INF/plexus/components.xml

@@ -28,6 +28,7 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JMethod;
 import org.codehaus.modello.plugin.java.javasource.JParameter;
@@ -37,6 +38,7 @@
 import org.codehaus.modello.plugins.xml.AbstractXmlJavaGenerator;
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.IOException;
@@ -49,6 +51,7 @@
  *
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  */
+@Component( role = ModelloGenerator.class, hint = "dom4j-reader" )
 public class Dom4jReaderGenerator
     extends AbstractXmlJavaGenerator
 {

modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java

@@ -28,6 +28,7 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JMethod;
 import org.codehaus.modello.plugin.java.javasource.JParameter;
@@ -39,6 +40,7 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.IOException;
 import java.util.List;
@@ -52,6 +54,7 @@
  *
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  */
+@Component( role = ModelloGenerator.class, hint = "dom4j-writer" )
 public class Dom4jWriterGenerator
     extends AbstractXmlJavaGenerator
 {

modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java

@@ -32,6 +32,7 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JConstructor;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -46,11 +47,13 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlClassMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
+@Component( role = ModelloGenerator.class, hint = "jackson-reader" )
 public class JacksonReaderGenerator
     extends AbstractJacksonGenerator
 {

modello-plugins/modello-plugin-dom4j/src/main/resources/META-INF/plexus/components.xml

@@ -32,6 +32,7 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JConstructor;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -42,10 +43,12 @@
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
+@Component( role = ModelloGenerator.class, hint = "jackson-writer" )
 public class JacksonWriterGenerator
     extends AbstractJacksonGenerator
 {

modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java

@@ -41,6 +41,7 @@
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JArrayType;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JCollectionType;
@@ -59,11 +60,13 @@
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
 import org.codehaus.modello.plugin.model.ModelClassMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:[email protected]">Jason van Zyl</a>
  */
+@Component( role = ModelloGenerator.class, hint = "java" )
 public class JavaModelloGenerator
     extends AbstractJavaModelloGenerator
 {

modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java

@@ -34,12 +34,14 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.util.Map;
 
 /**
  * @author <a href="mailto:[email protected]">Emmanuel Venisse </a>
  */
+@Component( role = MetadataPlugin.class, hint = "java" )
 public class JavaMetadataPlugin
     extends AbstractMetadataPlugin
     implements MetadataPlugin

modello-plugins/modello-plugin-jackson/src/main/resources/META-INF/plexus/components.xml

@@ -22,6 +22,7 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JConstructor;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -35,6 +36,7 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -44,6 +46,7 @@
 /**
  * @author [email protected]
  */
+@Component( role = ModelloGenerator.class, hint = "jdom-writer" )
 public class JDOMWriterGenerator
     extends AbstractJDOMGenerator
 {

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java

@@ -36,8 +36,10 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
+import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugins.xml.AbstractXmlJavaGenerator;
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 import com.fasterxml.jackson.core.JsonEncoding;
@@ -50,6 +52,7 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  * @since 1.8
  */
+@Component( role = ModelloGenerator.class, hint = "jsonschema" )
 public final class JsonSchemaGenerator
     extends AbstractXmlJavaGenerator
 {