This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository eugene. See https://gitlab.nuiton.org/nuiton/eugene.git commit b4f0041c8570dfa186a01737565f548a0c8fb225 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:24:03 2020 +0200 Fix releasable build [skip ci] --- eugene-java-templates/pom.xml | 7 +++++- .../org/nuiton/eugene/java/BeanTransformer.java | 5 +++- .../eugene/java/BeanTransformerTagValues.java | 5 +++- .../nuiton/eugene/java/EugeneJavaTagValues.java | 5 +++- .../nuiton/eugene/java/JavaBeanTransformer.java | 5 +++- .../eugene/java/JavaEnumerationTransformer.java | 4 ++- .../eugene/java/JavaInterfaceTransformer.java | 4 ++- .../eugene/java/SimpleJavaBeanTransformer.java | 4 ++- .../SimpleJavaBeanWithNoInterfaceTransformer.java | 4 ++- eugene-java-templates/src/site/site_en.xml | 1 - eugene-java-templates/src/site/site_fr.xml | 1 - eugene-maven-plugin/pom.xml | 5 ++++ .../eugene/test/generator/BeanGenerator.java | 15 +---------- .../eugene/test/generator/BeanTransformer.java | 2 +- .../org/nuiton/eugene/test/generator/Megatron.java | 2 +- .../eugene/plugin/TransformExtensionModelMojo.java | 4 +-- .../eugene/plugin/writer/XmiChainedFileWriter.java | 4 ++- .../plugin/writer/XmlModelChainedFileWriter.java | 5 +++- .../plugin/writer/YamlModelChainedFileWriter.java | 5 +++- .../plugin/writer/ZargoChainedFileWriter.java | 4 ++- eugene-maven-plugin/src/site/site_en.xml | 1 - eugene-maven-plugin/src/site/site_fr.xml | 1 - eugene-plantuml-templates/pom.xml | 5 ++++ .../plantuml/PlantumlTemplatesGenerator.java | 8 +++--- eugene-yaml-templates/pom.xml | 5 ++++ .../eugene/yaml/PureYamlTemplatesGenerator.java | 5 ++-- .../yaml/UserFriendlyTemplatesGenerator.java | 4 ++- eugene/pom.xml | 8 ++++-- .../org/nuiton/eugene/EugeneCoreTagValues.java | 4 ++- .../java/org/nuiton/eugene/java/JavaGenerator.java | 4 ++- .../eugene/models/object/ObjectModelAttribute.java | 4 +-- .../eugene/models/object/ObjectModelOperation.java | 2 +- .../eugene/models/object/ObjectModelParameter.java | 4 +-- .../models/object/reader/XmlObjectModelReader.java | 5 +++- .../object/reader/YamlObjectModelReader.java | 4 ++- .../object/xml/DigesterObjectModelRuleSet.java | 2 +- .../eugene/models/object/xml/ObjectModelImpl.java | 5 +++- .../eugene/models/state/StateModelReader.java | 4 ++- .../state/xml/DigesterStateModelRuleSet.java | 2 +- .../eugene/models/state/xml/StateModelImpl.java | 4 ++- .../eugene/writer/DefaultChainedWriterEngine.java | 4 ++- pom.xml | 16 +++++++----- src/site/site_en.xml | 29 +++++----------------- src/site/site_fr.xml | 28 +++++---------------- 44 files changed, 139 insertions(+), 110 deletions(-) diff --git a/eugene-java-templates/pom.xml b/eugene-java-templates/pom.xml index e9a23266..051aa6ff 100644 --- a/eugene-java-templates/pom.xml +++ b/eugene-java-templates/pom.xml @@ -85,6 +85,11 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> @@ -186,7 +191,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>3.0-alpha-10</version> + <version>${project.version}</version> <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformer.java index 115da2da..19eecc7c 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformer.java @@ -34,7 +34,10 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -70,9 +73,9 @@ import java.util.Set; * </pre> * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.BeanTransformer" * @since 3.0 */ +@Component(role = Template.class, hint = "org.nuiton.eugene.java.BeanTransformer") public class BeanTransformer extends ObjectModelTransformerToJava { /** Logger. */ diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformerTagValues.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformerTagValues.java index 203b737b..0dd09ba6 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformerTagValues.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/BeanTransformerTagValues.java @@ -24,10 +24,13 @@ package org.nuiton.eugene.java; import com.google.common.collect.ImmutableSet; import org.apache.commons.lang3.StringUtils; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; import org.nuiton.eugene.models.extension.tagvalue.matcher.EqualsTagValueNameMatcher; import org.nuiton.eugene.models.extension.tagvalue.provider.DefaultTagValueMetadatasProvider; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; @@ -41,9 +44,9 @@ import static org.nuiton.i18n.I18n.t; * Defines all tag values managed by Java templates. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider" role-hint="bean" * @since 2.5.6 */ +@Component(role = TagValueMetadatasProvider.class, hint = "bean") public class BeanTransformerTagValues extends DefaultTagValueMetadatasProvider { @Override diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/EugeneJavaTagValues.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/EugeneJavaTagValues.java index 4f6906f2..35faf7d1 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/EugeneJavaTagValues.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/EugeneJavaTagValues.java @@ -23,10 +23,13 @@ package org.nuiton.eugene.java; */ import com.google.common.collect.ImmutableSet; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; import org.nuiton.eugene.models.extension.tagvalue.matcher.EqualsTagValueNameMatcher; import org.nuiton.eugene.models.extension.tagvalue.provider.DefaultTagValueMetadatasProvider; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelPackage; @@ -40,9 +43,9 @@ import static org.nuiton.i18n.I18n.t; * Defines all tag values managed by Java templates. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider" role-hint="eugene-java-templates" * @since 2.5.6 */ +@Component(role = TagValueMetadatasProvider.class, hint = "eugene-java-templates") public class EugeneJavaTagValues extends DefaultTagValueMetadatasProvider { @Override diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java index 854aab1f..b58dbe20 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaBeanTransformer.java @@ -21,6 +21,9 @@ */ package org.nuiton.eugene.java; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModelClass; /** @@ -30,10 +33,10 @@ import org.nuiton.eugene.models.object.ObjectModelClass; * <b>This transformer is deprecated and you should use now {@link BeanTransformer} instead.</b> * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaBeanTransformer" * @since 2.0.2 * @deprecated since 3.0, no more usable, replaced by {@link BeanTransformer}. */ +@Component(role = Template.class, hint = "org.nuiton.eugene.java.JavaBeanTransformer") public class JavaBeanTransformer extends ObjectModelTransformerToJava { @Override diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java index 62578bd5..69bfaf01 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaEnumerationTransformer.java @@ -27,7 +27,9 @@ package org.nuiton.eugene.java; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.EugeneCoreTagValues; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModelEnumeration; import org.nuiton.eugene.models.object.ObjectModelPackage; @@ -38,9 +40,9 @@ import java.util.Collection; * stereotype enumeration. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaEnumerationTransformer" * @since 2.5 */ +@Component(role = Template.class, hint = "org.nuiton.eugene.java.JavaEnumerationTransformer") public class JavaEnumerationTransformer extends ObjectModelTransformerToJava { private static final Log log = diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java index e564bb37..51659e22 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/JavaInterfaceTransformer.java @@ -25,6 +25,8 @@ package org.nuiton.eugene.java; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelJavaModifier; @@ -40,9 +42,9 @@ import java.util.Set; * Created: 7 nov. 2009 * * @author Florian Desbois - desbois@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaInterfaceTransformer" * @since 2.0.2 */ +@Component(role = Template.class, hint = "org.nuiton.eugene.java.JavaInterfaceTransformer") public class JavaInterfaceTransformer extends ObjectModelTransformerToJava { private static final Log log = diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java index d09c73f0..ce0a2917 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanTransformer.java @@ -22,6 +22,8 @@ package org.nuiton.eugene.java; * #L% */ +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -33,11 +35,11 @@ import org.nuiton.eugene.models.object.ObjectModelClass; * <b>This transformer is deprecated and you should use now {@link BeanTransformer} instead.</b> * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.SimpleJavaBeanTransformer" * @since 2.6 * @deprecated since 3.0, no more usable, replaced by {@link BeanTransformer}. */ @Deprecated +@Component(role = Template.class, hint = "org.nuiton.eugene.java.SimpleJavaBeanTransformer") public class SimpleJavaBeanTransformer extends ObjectModelTransformerToJava { @Override diff --git a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java index b8f48eb8..1fdd02be 100644 --- a/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java +++ b/eugene-java-templates/src/main/java/org/nuiton/eugene/java/SimpleJavaBeanWithNoInterfaceTransformer.java @@ -22,6 +22,8 @@ package org.nuiton.eugene.java; * #L% */ +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -40,10 +42,10 @@ import org.nuiton.eugene.models.object.ObjectModelClass; * <b>This transformer is deprecated and you should use now {@link BeanTransformer} instead.</b> * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer" * @deprecated since 3.0, no more usable, replaced by {@link BeanTransformer}. */ @Deprecated +@Component(role = Template.class, hint = "org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer") public class SimpleJavaBeanWithNoInterfaceTransformer extends ObjectModelTransformerToJava { @Override diff --git a/eugene-java-templates/src/site/site_en.xml b/eugene-java-templates/src/site/site_en.xml index 93e01e0e..92c5d19e 100644 --- a/eugene-java-templates/src/site/site_en.xml +++ b/eugene-java-templates/src/site/site_en.xml @@ -47,7 +47,6 @@ <menu name="User"> <item href="index.html" name="Home"/> <item href="tag-values-report.html" name="Tag values"/> - <item href="stereotypes-report.html" name="Stereotypes"/> </menu> <menu ref="reports"/> diff --git a/eugene-java-templates/src/site/site_fr.xml b/eugene-java-templates/src/site/site_fr.xml index 5fee83cc..d9ad1ee9 100644 --- a/eugene-java-templates/src/site/site_fr.xml +++ b/eugene-java-templates/src/site/site_fr.xml @@ -51,7 +51,6 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> <item href="tag-values-report.html" name="Tag values"/> - <item href="stereotypes-report.html" name="Stéréotypes"/> </menu> <menu ref="reports"/> diff --git a/eugene-maven-plugin/pom.xml b/eugene-maven-plugin/pom.xml index e0ba4a9b..8d99867c 100644 --- a/eugene-maven-plugin/pom.xml +++ b/eugene-maven-plugin/pom.xml @@ -176,6 +176,11 @@ <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + <dependency> <groupId>org.nuiton</groupId> <artifactId>helper-maven-plugin-api</artifactId> diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java index 19a11ecf..26f7b723 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanGenerator.java @@ -20,19 +20,6 @@ * #L% */ -/* * -* BeanGenerator.java -* -* Created: 17 avril 2009 -* -* @author Tony Chemit - chemit@codelutin.com -* @version $Revision$ -* -* Mise a jour: $Date$ -* par : $Author$ -* @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.BeanGenerator" -*/ - package org.nuiton.eugene.test.generator; import org.apache.commons.lang3.StringUtils; @@ -65,8 +52,8 @@ import java.util.Set; /** * DTO generator - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanGenerator" */ +@Component(role = Template.class, hint = "org.nuiton.eugene.test.generator.BeanGenerator") public class BeanGenerator extends ObjectModelGenerator { /** Tag pour ajouter une annotation à un champ */ public static final String TAG_ANNOTATION = "annotation"; diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java index 1397e91b..ce296ffa 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/BeanTransformer.java @@ -58,8 +58,8 @@ import java.util.Iterator; * Created: 28 oct. 2009 * * @author Florian Desbois - desbois@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.BeanTransformer" */ +@Component(role = Template.class, hint = "org.nuiton.eugene.test.generator.BeanTransformer") public class BeanTransformer extends ObjectModelTransformerToJava { public BeanTransformer() { diff --git a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java index 6d3908c1..347d79ee 100644 --- a/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java +++ b/eugene-maven-plugin/src/it/generate/generators/src/main/java/org/nuiton/eugene/test/generator/Megatron.java @@ -32,8 +32,8 @@ import org.nuiton.eugene.models.object.ObjectModelClass; * Created: 12 nov. 2009 * * @author Florian Desbois - desbois@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.test.generator.Megatron" */ +@Component(role = Template.class, hint = "org.nuiton.eugene.test.generator.Megatron") public class Megatron extends ObjectModelTransformerToJava { public Megatron() { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TransformExtensionModelMojo.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TransformExtensionModelMojo.java index 10bc4f7a..854a01b1 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TransformExtensionModelMojo.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/TransformExtensionModelMojo.java @@ -49,7 +49,7 @@ import java.util.Arrays; * <li>ini</li> * <li>properties</li> * </ul> - * <h3>Example of ini format</h3> + * <h2>Example of ini format</h2> * <pre> * [model] * modeTagValue=value @@ -65,7 +65,7 @@ import java.util.Arrays; * attribute.attributeTagValue=value * attribute.attributeStereotype=true * </pre> - * <h3>Example of properties format</h3> + * <h2>Example of properties format</h2> * <pre> * model.tagValue.modeTagValue=value * model.stereotype.modelStereotype diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java index a8523c7c..11e8953a 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java @@ -22,8 +22,10 @@ package org.nuiton.eugene.plugin.writer; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.writer.ChainedFileWriter; import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; import org.nuiton.eugene.writer.WriterReport; import org.nuiton.plugin.PluginHelper; @@ -56,9 +58,9 @@ import java.util.Map; * vers du model). * * @author tchemit - * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="xmi" * @since 2.0.0 */ +@Component(role = ChainedFileWriter.class, hint = "xmi") public class XmiChainedFileWriter extends BaseChainedFileWriter { public static final String PROP_RESOLVER = "resolver"; diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmlModelChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmlModelChainedFileWriter.java index 6d6d615b..b4d1c2f9 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmlModelChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmlModelChainedFileWriter.java @@ -22,13 +22,16 @@ package org.nuiton.eugene.plugin.writer; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.writer.ChainedFileWriter; + /** * To create a memory model from xml model files. * * @author tchemit - * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="xmlModel2Memory" * @since 2.6.3 */ +@Component(role = ChainedFileWriter.class, hint = "xmlModel2Memory") public class XmlModelChainedFileWriter extends BaseChainedFileWriterToMemoryModel { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/YamlModelChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/YamlModelChainedFileWriter.java index 057a0767..5f1be35f 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/YamlModelChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/YamlModelChainedFileWriter.java @@ -22,13 +22,16 @@ package org.nuiton.eugene.plugin.writer; * #L% */ +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.writer.ChainedFileWriter; + /** * To create a memory model from yaml model files. * * @author tchemit - * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="yamlModel2Memory" * @since 2.6.3 */ +@Component(role = ChainedFileWriter.class, hint = "yamlModel2Memory") public class YamlModelChainedFileWriter extends BaseChainedFileWriterToMemoryModel { public YamlModelChainedFileWriter() { diff --git a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java index c4475a85..24a48719 100644 --- a/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java +++ b/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoChainedFileWriter.java @@ -22,8 +22,10 @@ package org.nuiton.eugene.plugin.writer; +import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.IOUtil; +import org.nuiton.eugene.writer.ChainedFileWriter; import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; import org.nuiton.eugene.writer.WriterReport; import org.nuiton.plugin.PluginHelper; @@ -43,9 +45,9 @@ import java.util.zip.ZipFile; * To write model files from zargo files. * * @author tchemit - * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="zargo2xmi" * @since 2.0.0 */ +@Component(role = ChainedFileWriter.class, hint = "zargo2xmi") public class ZargoChainedFileWriter extends BaseChainedFileWriter { public static final String[] XMI_FILE_FILTER = new String[]{"*.xmi", diff --git a/eugene-maven-plugin/src/site/site_en.xml b/eugene-maven-plugin/src/site/site_en.xml index 28e482f8..75a93bdc 100644 --- a/eugene-maven-plugin/src/site/site_en.xml +++ b/eugene-maven-plugin/src/site/site_en.xml @@ -51,7 +51,6 @@ <item name="generate" href="generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/> <item name="tag-values-report" href="tag-values-report.html"/> - <item name="stereotypes-report" href="stereotypes-report.html"/> <item name="help" href="help-mojo.html"/> </item> </menu> diff --git a/eugene-maven-plugin/src/site/site_fr.xml b/eugene-maven-plugin/src/site/site_fr.xml index 21ca8471..3ae433e4 100644 --- a/eugene-maven-plugin/src/site/site_fr.xml +++ b/eugene-maven-plugin/src/site/site_fr.xml @@ -55,7 +55,6 @@ <item name="generate" href="generate-mojo.html"/> <item name="available-data" href="available-data-mojo.html"/> <item name="tag-values-report" href="tag-values-report.html"/> - <item name="stereotypes-report" href="stereotypes-report.html"/> <item name="help" href="help-mojo.html"/> </item> </menu> diff --git a/eugene-plantuml-templates/pom.xml b/eugene-plantuml-templates/pom.xml index 6c9f1921..68f46fc2 100644 --- a/eugene-plantuml-templates/pom.xml +++ b/eugene-plantuml-templates/pom.xml @@ -50,5 +50,10 @@ <artifactId>plantuml</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + </dependencies> </project> diff --git a/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java b/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java index 2b9c4461..91041c97 100644 --- a/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java +++ b/eugene-plantuml-templates/src/main/java/org/nuiton/eugene/plantuml/PlantumlTemplatesGenerator.java @@ -24,6 +24,8 @@ package org.nuiton.eugene.plantuml; import net.sourceforge.plantuml.GeneratedImage; import net.sourceforge.plantuml.SourceFileReader; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -35,6 +37,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; import org.nuiton.eugene.models.object.reader.yaml.YamlUtil; +import org.nuiton.eugene.writer.ChainedFileWriter; import java.io.File; import java.io.IOException; @@ -48,12 +51,9 @@ import java.util.Set; /** * @author agiraudet - giraudet@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.plantuml.PlantumlTemplatesGenerator" * @since 2.6.4 */ - -//TODO: utiliser systeme de template - +@Component(role = Template.class, hint = "org.nuiton.eugene.plantuml.PlantumlTemplatesGenerator") public class PlantumlTemplatesGenerator extends ObjectModelGenerator implements KeyWords { @Override diff --git a/eugene-yaml-templates/pom.xml b/eugene-yaml-templates/pom.xml index ff1dd6ca..b312a4bb 100644 --- a/eugene-yaml-templates/pom.xml +++ b/eugene-yaml-templates/pom.xml @@ -45,6 +45,11 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + </dependencies> <build> diff --git a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java index 10095771..aa9050e0 100644 --- a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java +++ b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/PureYamlTemplatesGenerator.java @@ -22,6 +22,8 @@ package org.nuiton.eugene.yaml; * #L% */ +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.*; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; @@ -31,10 +33,9 @@ import java.util.Map; /** * @author agiraudet - giraudet@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.yaml.PureYamlTemplatesGenerator" * @since 2.6.4 */ - +@Component(role = Template.class, hint = "org.nuiton.eugene.yaml.PureYamlTemplatesGenerator") public class PureYamlTemplatesGenerator extends ObjectModelGenerator implements KeyWords { //TODO: tenir compte des valeurs par defaut : afficher seulement les valeurs différentes des valeurs par défaut diff --git a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java index 431af62b..2a8b759f 100644 --- a/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java +++ b/eugene-yaml-templates/src/main/java/org/nuiton/eugene/yaml/UserFriendlyTemplatesGenerator.java @@ -22,6 +22,8 @@ package org.nuiton.eugene.yaml; * #L% */ +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.reader.yaml.KeyWords; @@ -31,9 +33,9 @@ import java.io.Writer; /** * @author agiraudet - giraudet@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.yaml.UserFriendlyTemplatesGenerator" * @since 2.6.4 */ +@Component(role = Template.class, hint = "org.nuiton.eugene.yaml.UserFriendlyTemplatesGenerator") public class UserFriendlyTemplatesGenerator extends ObjectModelGenerator implements KeyWords { @Override diff --git a/eugene/pom.xml b/eugene/pom.xml index 81ff9758..441bccb1 100644 --- a/eugene/pom.xml +++ b/eugene/pom.xml @@ -134,6 +134,11 @@ <artifactId>plexus-utils</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </dependency> + </dependencies> <build> @@ -264,7 +269,6 @@ <reportSet> <reports> <report>tag-values-report</report> - <report>stereotypes-report</report> </reports> </reportSet> </reportSets> @@ -280,7 +284,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>3.0-alpha-1</version> + <version>${project.version}</version> <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/eugene/src/main/java/org/nuiton/eugene/EugeneCoreTagValues.java b/eugene/src/main/java/org/nuiton/eugene/EugeneCoreTagValues.java index c53a7ddf..1cbbadc7 100644 --- a/eugene/src/main/java/org/nuiton/eugene/EugeneCoreTagValues.java +++ b/eugene/src/main/java/org/nuiton/eugene/EugeneCoreTagValues.java @@ -23,10 +23,12 @@ package org.nuiton.eugene; */ import com.google.common.collect.ImmutableSet; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; import org.nuiton.eugene.models.extension.tagvalue.matcher.EqualsTagValueNameMatcher; import org.nuiton.eugene.models.extension.tagvalue.provider.DefaultTagValueMetadatasProvider; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -47,9 +49,9 @@ import static org.nuiton.i18n.I18n.t; * own tag values, to get a unique place where to find tag values. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider" role-hint="eugene" * @since 3.0 */ +@Component(role = TagValueMetadatasProvider.class, hint = "eugene") public class EugeneCoreTagValues extends DefaultTagValueMetadatasProvider { @Override diff --git a/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java index e17587a8..968c2a67 100644 --- a/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java +++ b/eugene/src/main/java/org/nuiton/eugene/java/JavaGenerator.java @@ -28,7 +28,9 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.Template; import org.nuiton.eugene.java.extension.AnnotationsManagerExtension; import org.nuiton.eugene.java.extension.ImportsManagerExtension; import org.nuiton.eugene.java.extension.ObjectModelAnnotation; @@ -68,8 +70,8 @@ import java.util.Set; * 9 * * @author Florian Desbois - desbois@codelutin.com - * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.eugene.java.JavaGenerator" */ +@Component(role = Template.class, hint = "org.nuiton.eugene.java.JavaGenerator") public class JavaGenerator extends ObjectModelGenerator { private static final Log log = LogFactory.getLog(JavaGenerator.class); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java index a4767d3a..966338dc 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelAttribute.java @@ -56,8 +56,8 @@ public interface ObjectModelAttribute extends ObjectModelParameter { /** * Returns the visibility of this attribute. * - * Possible values includes <tt>public</tt>, <tt>protected</tt> - * and <tt>private</tt>. + * Possible values includes {@code public}, {@code protected} + * and {@code private}. * * @return the visibility of this attribute. */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java index f022e80d..20b213c5 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelOperation.java @@ -44,7 +44,7 @@ public interface ObjectModelOperation extends ObjectModelElement { /** * Returns the visibility of this operation. - * Possible values includes <tt>public</tt>, <tt>protected</tt> and <tt>private</tt>. + * Possible values includes {@code public}, {@code protected} and {@code private}. * * @return the visibility of this operation. */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java index b8587e87..33847edf 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelParameter.java @@ -41,7 +41,7 @@ public interface ObjectModelParameter extends ObjectModelElement { /** * Returns the minimal multiplicity of this parameter. - * The <tt>-1</tt> value means infinite. + * The {@code -1} value means infinite. * * @return the minimal multiplicity of this parameter. */ @@ -49,7 +49,7 @@ public interface ObjectModelParameter extends ObjectModelElement { /** * Returns the maximal multiplicity of this parameter. - * The <tt>-1</tt> value means infinite. + * The {@code -1} value means infinite. * * @return the maximal multiplicity of this parameter. */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/XmlObjectModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/XmlObjectModelReader.java index 9f0f2203..ed884c67 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/XmlObjectModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/XmlObjectModelReader.java @@ -23,7 +23,10 @@ package org.nuiton.eugene.models.object.reader; import org.apache.commons.digester3.Digester; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.ModelHelper; +import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.Template; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; import org.xml.sax.SAXException; @@ -35,9 +38,9 @@ import java.io.IOException; * To read object xml model files into an memory object model. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="xmlobjectmodel" * @since 2.6.3 */ +@Component(role = ModelReader.class, hint = "xmlobjectmodel") public class XmlObjectModelReader extends AbstractObjectModelReader { protected Digester digester; diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java index 04425b6e..4caf55b4 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/reader/YamlObjectModelReader.java @@ -24,7 +24,9 @@ package org.nuiton.eugene.models.object.reader; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.ModelHelper; +import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.reader.yaml.LoadYamlFile; import org.yaml.snakeyaml.error.YAMLException; @@ -36,9 +38,9 @@ import java.io.IOException; * To read object model from yaml files into an memory object model. * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="yamlobjectmodel" * @since 2.6.3 */ +@Component(role = ModelReader.class, hint = "yamlobjectmodel") public class YamlObjectModelReader extends AbstractObjectModelReader { private static final Log log = LogFactory.getLog(YamlObjectModelReader.class); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java index 0b2b9bd6..1172428e 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/DigesterObjectModelRuleSet.java @@ -34,7 +34,7 @@ import org.apache.commons.digester3.RuleSetBase; * * Ce jeu de regle ne cree pas l'element racine. * Il doit etre cree et ajoute a la pile digester avant l'appel a - * <tt>Digester.parse(File)</tt>. + * {@code Digester.parse(File)}. * * Exemple: * <code> diff --git a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java index 80e0590f..90a33c60 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java @@ -25,7 +25,10 @@ package org.nuiton.eugene.models.object.xml; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.ModelHelper; +import org.nuiton.eugene.ModelReader; +import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -53,8 +56,8 @@ import java.util.Set; * Created: 14 janv. 2004 * * @author Cédric Pineau - pineau@codelutin.com - * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="objectmodel" */ +@Component(role = Model.class, hint = "objectmodel") public class ObjectModelImpl implements ObjectModel { /** logger */ diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java index 9dd0d5bd..28a11158 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/StateModelReader.java @@ -25,10 +25,12 @@ package org.nuiton.eugene.models.state; import org.apache.commons.digester3.Digester; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.ModelHelper; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.state.xml.DigesterStateModelRuleSet; import org.nuiton.eugene.models.state.xml.StateModelImpl; +import org.nuiton.eugene.writer.ChainedWriterEngine; import org.nuiton.util.FileUtil; import org.nuiton.util.RecursiveProperties; import org.xml.sax.SAXException; @@ -43,8 +45,8 @@ import java.io.IOException; * Created: 26 oct. 2009 * * @author Florian Desbois - desbois@codelutin.com - * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ +@Component(role = ModelReader.class, hint = "statemodel") public class StateModelReader extends ModelReader<StateModel> { private static final Log log = LogFactory.getLog(StateModelReader.class); diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java index 76d0afa4..8f10ffab 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/DigesterStateModelRuleSet.java @@ -34,7 +34,7 @@ import org.apache.commons.digester3.RuleSetBase; * * Ce jeu de regle ne cree pas l'element racine. * Il doit etre cree et ajoute a la pile digester avant l'appel a - * <tt>Digester.parse(File)</tt>. + * {@code Digester.parse(File)}. * * Exemple: * <code> diff --git a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java index 800484ee..2f939e9c 100644 --- a/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java +++ b/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java @@ -22,7 +22,9 @@ package org.nuiton.eugene.models.state.xml; +import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.ModelHelper; +import org.nuiton.eugene.models.Model; import org.nuiton.eugene.models.state.StateModel; import org.nuiton.eugene.models.state.StateModelStateChart; @@ -38,8 +40,8 @@ import java.util.Set; * Implementation of the {@link StateModel}. * * @author chatellier - * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="statemodel" */ +@Component(role = Model.class, hint = "statemodel") public class StateModelImpl implements StateModel { /** diff --git a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java index 16c29d46..e81883ea 100644 --- a/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java +++ b/eugene/src/main/java/org/nuiton/eugene/writer/DefaultChainedWriterEngine.java @@ -25,6 +25,8 @@ package org.nuiton.eugene.writer; import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codehaus.plexus.component.annotations.Component; +import org.nuiton.eugene.models.extension.tagvalue.provider.TagValueMetadatasProvider; import java.io.File; import java.io.IOException; @@ -44,9 +46,9 @@ import java.util.regex.Pattern; * Created: 17 déc. 2009 * * @author Tony Chemit - chemit@codelutin.com - * @plexus.component role="org.nuiton.eugene.writer.ChainedWriterEngine" role-hint="default" * @since 2.0.0 */ +@Component(role = ChainedWriterEngine.class, hint = "default") public class DefaultChainedWriterEngine implements ChainedWriterEngine { /** Logger */ diff --git a/pom.xml b/pom.xml index ed9eaa87..881c1e0d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>pom</artifactId> - <version>11.4</version> + <artifactId>nuitonpom</artifactId> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>eugene</artifactId> @@ -134,8 +134,6 @@ <properties> - <!-- redmine project Id --> - <gitlabGroupName>nuiton</gitlabGroupName> <gitlabProjectName>eugene</gitlabProjectName> <processorPluginVersion>1.3</processorPluginVersion> @@ -384,6 +382,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + <version>2.0.0</version> + </dependency> + <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-sink-api</artifactId> @@ -513,7 +517,7 @@ <id>xsd-to-site</id> <phase>pre-site</phase> <configuration> - <tasks> + <target> <copy todir="target/site/xsd/v1" verbose="${maven.verbose}" failonerror="false" overwrite="true"> <fileset dir="${basedir}/eugene/src/main/resources/xsd"> <include name="**/*.xsd" /> @@ -524,7 +528,7 @@ <include name="**/*.dtd" /> </fileset> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 80c94fd4..96f67a2c 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -22,9 +22,9 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -36,14 +36,6 @@ <href>http://www.codelutin.com</href> </bannerRight> - <poweredBy> - - <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="https://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - </poweredBy> - <body> <links> @@ -53,8 +45,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu name="Documentation"> @@ -77,9 +68,9 @@ </menu> <menu name="Trackers" inherit="top"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> - <item name="Evolutions" href="${project.issueManagement.url}?query_id=1"/> - <item name="Help" href="${project.issueManagement.url}?query_id=3"/> + <item name="Bugs" href="${this.issueManagement.url}?query_id=2"/> + <item name="Evolutions" href="${this.issueManagement.url}?query_id=1"/> + <item name="Help" href="${this.issueManagement.url}?query_id=3"/> </menu> <menu name="Links" inherit="top"> @@ -94,13 +85,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='en' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=',05-execution,'/> - </footer> - </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 0ba9a855..a45dc366 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -21,9 +21,9 @@ #L% --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -35,13 +35,6 @@ <href>http://www.codelutin.com</href> </bannerRight> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="https://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - </poweredBy> - <body> <links> @@ -51,8 +44,7 @@ </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/fr/index.html"/> + <item name="${project.name}" href="${this.url}/index.html"/> </breadcrumbs> <menu name="Documentation"> @@ -75,10 +67,10 @@ </menu> <menu name="Trackers"> - <item name="Bugs" href="${project.issueManagement.url}?query_id=2"/> + <item name="Bugs" href="${this.issueManagement.url}?query_id=2"/> <item name="Améliorations" - href="${project.issueManagement.url}?query_id=1"/> - <item name="Aide" href="${project.issueManagement.url}?query_id=3"/> + href="${this.issueManagement.url}?query_id=1"/> + <item name="Aide" href="${this.issueManagement.url}?query_id=3"/> </menu> <menu name="Liens"> @@ -99,13 +91,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=',05-execution,'/> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.