diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java index 8f6139921..dcf4269a4 100644 --- a/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java +++ b/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java @@ -22,21 +22,25 @@ * SOFTWARE. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.ModelloRuntimeException; import org.codehaus.modello.plugin.AbstractPluginManager; import org.codehaus.modello.plugin.ModelloGenerator; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; /** * @author Trygve Laugstøl */ -@Component(role = GeneratorPluginManager.class) +@Named +@Singleton public class DefaultGeneratorPluginManager extends AbstractPluginManager implements GeneratorPluginManager { - @Requirement + + @Inject private Map plugins; public Map getPlugins() { diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java index 494dd2ca3..de1f15e89 100644 --- a/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java +++ b/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java @@ -22,21 +22,25 @@ * SOFTWARE. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.ModelloRuntimeException; import org.codehaus.modello.metadata.MetadataPlugin; import org.codehaus.modello.plugin.AbstractPluginManager; -import org.codehaus.plexus.component.annotations.Component; -import org.codehaus.plexus.component.annotations.Requirement; /** * @author Trygve Laugstøl */ -@Component(role = MetadataPluginManager.class) +@Named +@Singleton public class DefaultMetadataPluginManager extends AbstractPluginManager implements MetadataPluginManager { - @Requirement + + @Inject private Map plugins; public Map getPlugins() { diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java index ba77df3fc..fc5054e28 100644 --- a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java +++ b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java @@ -22,6 +22,10 @@ * SOFTWARE. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.IOException; import java.io.Reader; @@ -49,20 +53,20 @@ 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; /** * @author Trygve Laugstøl * @author Emmanuel Venisse */ -@Component(role = ModelloCore.class) +@Named +@Singleton public class DefaultModelloCore extends AbstractModelloCore { - @Requirement + + @Inject private MetadataPluginManager metadataPluginManager; - @Requirement + @Inject private GeneratorPluginManager generatorPluginManager; public MetadataPluginManager getMetadataPluginManager() { diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java b/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java index 4ec4a0b21..e9711a9ba 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.metadata.AbstractMetadataPlugin; @@ -36,12 +39,12 @@ 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; /** * @author Emmanuel Venisse */ -@Component(role = MetadataPlugin.class, hint = "model") +@Named("model") +@Singleton public class ModelMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin { public static final String ROOT_ELEMENT = "rootElement"; diff --git a/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java b/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java index 60373ed1d..35478370a 100644 --- a/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java +++ b/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java @@ -23,6 +23,8 @@ */ import org.codehaus.modello.ModelloRuntimeException; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; /** @@ -70,4 +72,10 @@ public void testRecursion() throws Exception { modello.loadModel(getTestFile("src/test/resources/models/recursion.mdo")); } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration configuration) { + configuration.setAutoWiring(true); + configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); + } } diff --git a/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java b/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java index 3cdff59e9..143402a0f 100644 --- a/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java +++ b/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java @@ -31,6 +31,8 @@ import org.codehaus.modello.model.ModelField; import org.codehaus.modello.model.Version; import org.codehaus.modello.model.VersionRange; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; /** @@ -164,4 +166,10 @@ private void assertGirlAge(Object ageObject) { assertEquals("int", age.getType()); } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration configuration) { + configuration.setAutoWiring(true); + configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); + } } diff --git a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java index c18aa98f5..8eba0cb7a 100644 --- a/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java +++ b/modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -38,7 +41,6 @@ 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; @@ -50,13 +52,13 @@ 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; /** * Generate a basic conversion class between two versions of a model. */ -@Component(role = ModelloGenerator.class, hint = "converters") +@Named("converters") +@Singleton public class ConverterGenerator extends AbstractJavaModelloGenerator { public void generate(Model model, Properties parameters) throws ModelloException { initialize(model, parameters); diff --git a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java index 41835514d..d90ed8112 100644 --- a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java +++ b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -42,7 +44,6 @@ 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; /** @@ -51,7 +52,8 @@ * * @author Brett Porter */ -@Component(role = ModelloGenerator.class, hint = "dom4j-reader") +@Named("dom4j-reader") +@Singleton public class Dom4jReaderGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java index 98ebe1d61..66308e613 100644 --- a/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java +++ b/modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -44,7 +46,6 @@ 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; /** *

@@ -54,7 +55,8 @@ * * @author Brett Porter */ -@Component(role = ModelloGenerator.class, hint = "dom4j-writer") +@Named("dom4j-writer") +@Singleton public class Dom4jWriterGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java index 9e02ecb9f..885f34e13 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -47,13 +49,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 Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "jackson-reader") +@Named("jackson-reader") +@Singleton public class JacksonReaderGenerator extends AbstractJacksonGenerator { private static final String SOURCE_PARAM = "source"; diff --git a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java index 11f37f8bb..af0c39e68 100644 --- a/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java +++ b/modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -43,12 +45,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 Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "jackson-writer") +@Named("jackson-writer") +@Singleton public class JacksonWriterGenerator extends AbstractJacksonGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java index df21b7750..9056452e8 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.io.Serializable; import java.util.Arrays; @@ -41,7 +44,6 @@ 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; @@ -60,13 +62,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 Jason van Zyl */ -@Component(role = ModelloGenerator.class, hint = "java") +@Named("java") +@Singleton public class JavaModelloGenerator extends AbstractJavaModelloGenerator { private Collection immutableTypes = new HashSet(Arrays.asList(new String[] { diff --git a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java index 0c96a8039..b576fc093 100644 --- a/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java +++ b/modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.metadata.AbstractMetadataPlugin; @@ -36,12 +39,12 @@ 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; /** * @author Emmanuel Venisse */ -@Component(role = MetadataPlugin.class, hint = "java") +@Named("java") +@Singleton public class JavaMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin { public static final String JAVA_ABSTRACT = "java.abstract"; diff --git a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java index 9b11fafed..de3a833e3 100644 --- a/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java +++ b/modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java @@ -16,6 +16,9 @@ */ package org.codehaus.modello.plugin.jdom; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -27,7 +30,6 @@ 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; @@ -41,12 +43,12 @@ 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; /** * @author mkleint@codehaus.org */ -@Component(role = ModelloGenerator.class, hint = "jdom-writer") +@Named("jdom-writer") +@Singleton public class JDOMWriterGenerator extends AbstractJDOMGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java index c9e07efd7..92ccbff5c 100644 --- a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java +++ b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -40,17 +43,16 @@ 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; /** * @author Simone Tripodi * @since 1.8 */ -@Component(role = ModelloGenerator.class, hint = "jsonschema") +@Named("jsonschema") +@Singleton public final class JsonSchemaGenerator extends AbstractXmlJavaGenerator { public void generate(Model model, Properties parameters) throws ModelloException { diff --git a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java index 0290d1404..6b80b6994 100644 --- a/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java +++ b/modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -47,13 +49,13 @@ 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; /** * @since 1.8 * @author Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "sax-writer") +@Named("sax-writer") +@Singleton public class SaxWriterGenerator extends AbstractXmlJavaGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java index 6dc2a6566..def3831c3 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java @@ -22,16 +22,18 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import org.codehaus.modello.model.ModelClass; -import org.codehaus.modello.plugin.ModelloGenerator; -import org.codehaus.plexus.component.annotations.Component; /** * The generator for Jackson-based parsers that support input location tracking. * * @author Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "snakeyaml-extended-reader") +@Named("snakeyaml-extended-reader") +@Singleton public class SnakeYamlExtendedReaderGenerator extends SnakeYamlReaderGenerator { @Override diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java index 9f65c6447..fb20fb558 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -45,13 +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 Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "snakeyaml-reader") +@Named("snakeyaml-reader") +@Singleton public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator { private static final String SOURCE_PARAM = "source"; diff --git a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java index 8305e4408..5894b34b7 100644 --- a/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java +++ b/modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -43,12 +45,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 Simone Tripodi */ -@Component(role = ModelloGenerator.class, hint = "snakeyaml-writer") +@Named("snakeyaml-writer") +@Singleton public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator { public void generate(Model model, Properties parameters) throws ModelloException { diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java index cb116ef3b..62820506e 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -36,7 +39,6 @@ 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.javasource.JClass; import org.codehaus.modello.plugin.java.javasource.JField; import org.codehaus.modello.plugin.java.javasource.JMethod; @@ -49,14 +51,14 @@ 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 org.codehaus.plexus.util.StringUtils; /** * @author Jason van Zyl * @author Emmanuel Venisse */ -@Component(role = ModelloGenerator.class, hint = "stax-reader") +@Named("stax-reader") +@Singleton public class StaxReaderGenerator extends AbstractStaxGenerator { private boolean requiresDomSupport; diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java index 5866afebd..8fb787cd8 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -37,7 +40,6 @@ import org.codehaus.modello.plugin.java.javasource.JSourceCode; import org.codehaus.modello.plugin.java.javasource.JSourceWriter; import org.codehaus.modello.plugin.java.javasource.JType; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; /** @@ -45,7 +47,8 @@ * * @author Benjamin Bentmann */ -@Component(role = StaxSerializerGenerator.class, hint = "stax-serializer") +@Named("stax-serializer") +@Singleton public class StaxSerializerGenerator extends AbstractStaxGenerator { public void generate(Model model, Properties parameters) throws ModelloException { diff --git a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java index 28f3e1cde..0e01724c8 100644 --- a/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java +++ b/modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java @@ -22,6 +22,10 @@ * SOFTWARE. */ +import javax.inject.Inject; +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +36,6 @@ 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,19 +49,18 @@ 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 org.codehaus.plexus.component.annotations.Requirement; /** * @author Jason van Zyl * @author Emmanuel Venisse */ -@Component(role = ModelloGenerator.class, hint = "stax-writer") +@Named("stax-writer") +@Singleton public class StaxWriterGenerator extends AbstractStaxGenerator { private boolean requiresDomSupport; - @Requirement + @Inject private StaxSerializerGenerator serializerGenerator; public void generate(Model model, Properties parameters) throws ModelloException { diff --git a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java index a785e0fc0..9aaea02b2 100644 --- a/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java +++ b/modello-plugins/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java @@ -19,6 +19,9 @@ * under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.io.Writer; import java.nio.charset.StandardCharsets; @@ -37,11 +40,10 @@ import org.codehaus.modello.model.Model; import org.codehaus.modello.model.Version; import org.codehaus.modello.plugin.AbstractModelloGenerator; -import org.codehaus.modello.plugin.ModelloGenerator; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.io.CachingWriter; -@Component(role = ModelloGenerator.class, hint = "velocity") +@Named("velocity") +@Singleton public class VelocityGenerator extends AbstractModelloGenerator { public static final String VELOCITY_BASEDIR = "modello.velocity.basedir"; diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java index 990f03b43..6acc1ddf1 100644 --- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java +++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/XdocGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.IOException; import java.io.Writer; @@ -44,7 +47,6 @@ import org.codehaus.modello.model.ModelField; import org.codehaus.modello.model.Version; import org.codehaus.modello.model.VersionRange; -import org.codehaus.modello.plugin.ModelloGenerator; import org.codehaus.modello.plugin.xdoc.metadata.XdocClassMetadata; import org.codehaus.modello.plugin.xdoc.metadata.XdocFieldMetadata; import org.codehaus.modello.plugin.xsd.XsdModelHelper; @@ -53,7 +55,6 @@ import org.codehaus.modello.plugins.xml.metadata.XmlClassMetadata; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata; -import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.WriterFactory; import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; @@ -65,7 +66,8 @@ * @author Jason van Zyl * @author Emmanuel Venisse */ -@Component(role = ModelloGenerator.class, hint = "xdoc") +@Named("xdoc") +@Singleton public class XdocGenerator extends AbstractXmlGenerator { private static final VersionRange DEFAULT_VERSION_RANGE = new VersionRange("0.0.0+"); diff --git a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/metadata/XdocMetadataPlugin.java b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/metadata/XdocMetadataPlugin.java index 3db1e3d60..bfc0a9f88 100644 --- a/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/metadata/XdocMetadataPlugin.java +++ b/modello-plugins/modello-plugin-xdoc/src/main/java/org/codehaus/modello/plugin/xdoc/metadata/XdocMetadataPlugin.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.ModelloException; @@ -37,12 +40,12 @@ 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; /** * @author HervĂ© Boutemy */ -@Component(role = MetadataPlugin.class, hint = "stax-writer") +@Named("stax-writer") +@Singleton public class XdocMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin { public static final String XDOC_SEPARATOR = "xdoc.separator"; public static final String XDOC_ANCHORNAME = "xdoc.anchorName"; diff --git a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/metadata/XmlMetadataPlugin.java b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/metadata/XmlMetadataPlugin.java index 109648b0c..c3f3f13a8 100644 --- a/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/metadata/XmlMetadataPlugin.java +++ b/modello-plugins/modello-plugin-xml/src/main/java/org/codehaus/modello/plugins/xml/metadata/XmlMetadataPlugin.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.metadata.AbstractMetadataPlugin; @@ -36,13 +39,13 @@ 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; /** * @author Trygve Laugstøl * @author Emmanuel Venisse */ -@Component(role = MetadataPlugin.class, hint = "xml") +@Named("xml") +@Singleton public class XmlMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin { public static final String XML_ATTRIBUTE = "xml.attribute"; diff --git a/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java b/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java index 723175b73..9074e1a35 100644 --- a/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java +++ b/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java @@ -33,6 +33,8 @@ import org.codehaus.modello.model.Version; import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata; import org.codehaus.modello.plugins.xml.metadata.XmlMetadataPlugin; +import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; /** @@ -104,4 +106,10 @@ public void testXmlPlugin() throws Exception { assertTrue(xml.isTrim()); } + + @Override + protected void customizeContainerConfiguration(ContainerConfiguration configuration) { + configuration.setAutoWiring(true); + configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); + } } diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java index 262200d8d..138a728ce 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java @@ -22,16 +22,18 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import org.codehaus.modello.model.ModelClass; -import org.codehaus.modello.plugin.ModelloGenerator; -import org.codehaus.plexus.component.annotations.Component; /** * The generator for XPP3-based parsers that support input location tracking. * * @author Benjamin Bentmann */ -@Component(role = ModelloGenerator.class, hint = "xpp3-extended-reader") +@Named("xpp3-extended-reader") +@Singleton public class Xpp3ExtendedReaderGenerator extends Xpp3ReaderGenerator { @Override diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java index 07c2d9a78..e9c2d1d7a 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java @@ -22,14 +22,15 @@ * SOFTWARE. */ -import org.codehaus.modello.plugin.ModelloGenerator; +import javax.inject.Named; +import javax.inject.Singleton; + import org.codehaus.modello.plugin.java.javasource.JClass; import org.codehaus.modello.plugin.java.javasource.JField; import org.codehaus.modello.plugin.java.javasource.JMethod; import org.codehaus.modello.plugin.java.javasource.JParameter; import org.codehaus.modello.plugin.java.javasource.JSourceCode; import org.codehaus.modello.plugin.java.javasource.JType; -import org.codehaus.plexus.component.annotations.Component; /** * The generator for XPP3-based writers that support input location tracking. @@ -37,7 +38,8 @@ * @author HervĂ© Boutemy * @since 1.10 */ -@Component(role = ModelloGenerator.class, hint = "xpp3-extended-writer") +@Named("xpp3-extended-writer") +@Singleton public class Xpp3ExtendedWriterGenerator extends Xpp3WriterGenerator { @Override protected boolean isLocationTracking() { diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java index 41ed52ad1..2e9a3a5d1 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -32,7 +35,6 @@ 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; @@ -48,14 +50,14 @@ 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 Jason van Zyl * @author Emmanuel Venisse */ -@Component(role = ModelloGenerator.class, hint = "xpp3-reader") +@Named("xpp3-reader") +@Singleton public class Xpp3ReaderGenerator extends AbstractXpp3Generator { private static final String SOURCE_PARAM = "source"; diff --git a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java index cc99ef5ea..2ca5be321 100644 --- a/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java +++ b/modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.IOException; import java.util.List; import java.util.Properties; @@ -33,7 +36,6 @@ 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.JField; import org.codehaus.modello.plugin.java.javasource.JMethod; @@ -46,13 +48,13 @@ 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; /** * @author Jason van Zyl * @author Emmanuel Venisse */ -@Component(role = ModelloGenerator.class, hint = "xpp3-writer") +@Named("xpp3-writer") +@Singleton public class Xpp3WriterGenerator extends AbstractXpp3Generator { private String extendedClassnameSuffix; diff --git a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java index 754229138..0129787e0 100644 --- a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java +++ b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java @@ -22,6 +22,9 @@ * SOFTWARE. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.io.File; import java.io.IOException; import java.io.Writer; @@ -36,12 +39,10 @@ import org.codehaus.modello.model.ModelAssociation; import org.codehaus.modello.model.ModelClass; import org.codehaus.modello.model.ModelField; -import org.codehaus.modello.plugin.ModelloGenerator; import org.codehaus.modello.plugin.xsd.metadata.XsdClassMetadata; import org.codehaus.modello.plugins.xml.AbstractXmlGenerator; 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 org.codehaus.plexus.util.WriterFactory; import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter; @@ -50,7 +51,8 @@ /** * @author Brett Porter */ -@Component(role = ModelloGenerator.class, hint = "xsd") +@Named("xsd") +@Singleton public class XsdGenerator extends AbstractXmlGenerator { /** * Value standing for any element name (used on xml.tagName) diff --git a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java index 685611a28..7ffaec06f 100644 --- a/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java +++ b/modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/metadata/XsdMetadataPlugin.java @@ -16,6 +16,9 @@ * limitations under the License. */ +import javax.inject.Named; +import javax.inject.Singleton; + import java.util.Map; import org.codehaus.modello.ModelloException; @@ -24,21 +27,20 @@ import org.codehaus.modello.metadata.ClassMetadata; import org.codehaus.modello.metadata.FieldMetadata; import org.codehaus.modello.metadata.InterfaceMetadata; -import org.codehaus.modello.metadata.MetadataPlugin; import org.codehaus.modello.metadata.ModelMetadata; import org.codehaus.modello.model.Model; import org.codehaus.modello.model.ModelAssociation; 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; /** * XsdMetadataPlugin * * @author Joakim Erdfelt */ -@Component(role = MetadataPlugin.class, hint = "xdoc") +@Named("xdoc") +@Singleton public class XsdMetadataPlugin extends AbstractMetadataPlugin { public static final String NAMESPACE = "xsd.namespace"; diff --git a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java index f46cece1a..9df849bf4 100644 --- a/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java +++ b/modello-test/src/main/java/org/codehaus/modello/AbstractModelloGeneratorTest.java @@ -33,6 +33,7 @@ import java.util.Properties; import org.codehaus.plexus.ContainerConfiguration; +import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.ReaderFactory; @@ -112,5 +113,7 @@ protected SAXParser createSaxParserWithSchema(String generatedXsdName) @Override protected void customizeContainerConfiguration(ContainerConfiguration containerConfiguration) { containerConfiguration.setClassPathScanning("cache"); + containerConfiguration.setAutoWiring(true); + containerConfiguration.setClassPathScanning(PlexusConstants.SCANNING_INDEX); } } diff --git a/pom.xml b/pom.xml index 10bc271cd..2d6ab3b0b 100644 --- a/pom.xml +++ b/pom.xml @@ -356,12 +356,8 @@ + - - org.codehaus.plexus - plexus-component-annotations - 2.2.0 - junit junit @@ -373,6 +369,13 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + none + + org.apache.maven.plugins maven-enforcer-plugin @@ -433,6 +436,7 @@ + org.apache.maven.plugins @@ -450,16 +454,8 @@ - org.codehaus.plexus - plexus-component-metadata - 2.2.0 - - - - generate-metadata - - - + org.eclipse.sisu + sisu-maven-plugin