Author: tchemit Date: 2014-05-04 12:58:54 +0200 (Sun, 04 May 2014) New Revision: 1349 Url: http://forge.nuiton.org/projects/eugene/repository/revisions/1349 Log: fix some urls Modified: trunk/changelog.txt trunk/eugene-maven-plugin/changelog.txt trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/eugene-maven-plugin/src/site/fr/rst/index.rst trunk/eugene-maven-plugin/src/site/rst/index.rst trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst trunk/eugene/changelog.txt trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java trunk/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl trunk/eugene/src/site/fr/rst/index.rst trunk/eugene/src/site/rst/index.rst trunk/src/site/fr/rst/03-generation.rst trunk/src/site/fr/rst/07-glossaire.rst trunk/src/site/rst/03-generation.rst trunk/src/site/rst/07-glossaire.rst Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/changelog.txt 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,6 +1,6 @@ 2.0.0 * Changelog is not any longer maintained, please refer to the release note : - http://maven-site.nuiton.org/eugene/changes-report.html + http://doc.nuiton.org/eugene/changes-report.html 1.0.1 xxx xxx Modified: trunk/eugene/changelog.txt =================================================================== --- trunk/eugene/changelog.txt 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/changelog.txt 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,6 +1,6 @@ 2.0.0 * Changelog is not any longer maintained, please refer to the release note : - http://maven-site.nuiton.org/eugene/changes-report.html + http://doc.nuiton.org/eugene/changes-report.html 1.0.1 * 20091016 [chatellier] Regression on ant task, was generating model file one by one Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/ObjectModelReader.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; import org.nuiton.eugene.ModelHelper; -import org.nuiton.eugene.ModelPropertiesUtil; import org.nuiton.eugene.ModelReader; import org.nuiton.eugene.models.object.reader.XmlObjectModelReader; import org.nuiton.eugene.models.object.xml.DigesterObjectModelRuleSet; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/AbstractObjectModelReader.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -86,32 +86,6 @@ public static final String CLASS = "class"; -// /** -// * Pattern to define tag values authorized at classifier level in the model -// * properties file. -// * <p/> -// * L'expression réguliere match les chaines de type -// * <package.ClassName>.<class|attribute|operation>.[name].<stereotype|tagvalue>.[tag] -// * fr.isisfish.entities.Population.class.stereotype=entity -// * fr.isisfish.entities.Population.class.tagvalue.persistenceType=flatfile -// * fr.isisfish.entities.Population.attribute.name.stereotype=... -// * fr.isisfish.entities.Population.attribute.name.tagvalue.pk=topiaId -// * fr.isisfish.entities.Population.operation.getRegion.stereotype=... -// * fr.isisfish.entities.Population.operation.getRegion.tagvalue.pk=... -// */ -// protected Pattern propertiesPattern = Pattern -// .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(tagvalue|tagValue)?)\\.([_a-z0-9][_a-zA-Z0-9]*)?$"); - -// protected Pattern stereotypePattern = Pattern -// .compile("^((?:[_a-zA-Z0-9]+\\.)+(?:_?[A-Z][_a-zA-Z0-9]*\\.)+)(?:(class|attribute|operation))\\.(?:([_a-zA-Z0-9]+)\\.)?(?:(stereotype)?)$"); - -// /** -// * Pattern to define tag values authorized at model level in the model -// * properties file. -// */ -// protected Pattern modelTagValuePattern = Pattern.compile( -// "^model\\.(?:(tagvalue|tagValue)?)\\.((?:.+))$"); - public static final String MODEL = "model"; @Override Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/reader/InvalidModelPropertiesException.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.object.reader; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + /** * Created on 5/1/14. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/InvalidStereotypeSyntaxException.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.stereotype; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + /** * Created on 5/1/14. * Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/MyStereotypeDefinitionProvider.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.stereotype; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import org.nuiton.eugene.models.object.ObjectModelAttribute; /** Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/stereotype/Stereotypes.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.stereotype; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableSet; import java.util.Set; Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/tagvalue/InvalidTagValueSyntaxException.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,5 +1,27 @@ package org.nuiton.eugene.models.tagvalue; +/* + * #%L + * EUGene :: EUGene + * %% + * Copyright (C) 2004 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + /** * Created on 5/1/14. * Modified: trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/xsl/xmi1.2ToObjectModel.xsl 2014-05-04 10:58:54 UTC (rev 1349) @@ -55,7 +55,7 @@ <xsl:template match="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement"> <xsl:element name="objectModel"> - <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://doc.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="../@name"/> </xsl:attribute> Modified: trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl =================================================================== --- trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/main/xsl/xmi2.1ToObjectModel.xsl 2014-05-04 10:58:54 UTC (rev 1349) @@ -51,7 +51,7 @@ <xsl:template match="uml:Model"> <xsl:element name="objectModel"> - <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> + <xsl:attribute name="xsi:schemaLocation">http://nuiton.org/eugene/objectModel/v1 http://doc.nuiton.org/eugene/xsd/v1/objectmodel.xsd</xsl:attribute> <xsl:attribute name="name"> <xsl:value-of select="@name" /> </xsl:attribute> Modified: trunk/eugene/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene/src/site/fr/rst/index.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/site/fr/rst/index.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -73,13 +73,13 @@ la syntaxe Java correpondante. Les classes Java obtenues peuvent donc être compilées et deviennent autonomes. -.. _NuitonProcessor: http://maven-site.nuiton.org/processor/ +.. _NuitonProcessor: http://doc.nuiton.org/processor/ Règle ant --------- Une tâche ant est disponible à l'adresse suivante -http://maven-site.nuiton.org/eugene/ant-eugene-task. Il permet l'utilisation +http://doc.nuiton.org/eugene/ant-eugene-task. Il permet l'utilisation depuis Ant de Eugene. @@ -87,5 +87,5 @@ ------------ Un plugin maven est disponnible à l'adresse suivante -http://maven-site.nuiton.org/eugene/eugene-maven-plugin . Il permet l'utilisation +http://doc.nuiton.org/eugene/eugene-maven-plugin . Il permet l'utilisation depuis maven de Eugene. Modified: trunk/eugene/src/site/rst/index.rst =================================================================== --- trunk/eugene/src/site/rst/index.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene/src/site/rst/index.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -77,4 +77,4 @@ independents. -.. _NuitonProcessor: http://maven-site.nuiton.org/processor/ +.. _NuitonProcessor: http://doc.nuiton.org/processor/ Modified: trunk/eugene-maven-plugin/changelog.txt =================================================================== --- trunk/eugene-maven-plugin/changelog.txt 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene-maven-plugin/changelog.txt 2014-05-04 10:58:54 UTC (rev 1349) @@ -1,6 +1,6 @@ 2.0.0 * Changelog is not any longer maintained, please refer to the release note : - http://maven-site.nuiton.org/eugene/changes-report.html + http://doc.nuiton.org/eugene/changes-report.html 1.0.0 xxx xxx * Add multiple models loading and restricted package generation Modified: trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene-maven-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2014-05-04 10:58:54 UTC (rev 1349) @@ -52,8 +52,8 @@ getLog().warn("Since version 2.5, smart-generate is deprecated (it will be removed in version 3.0)."); getLog().warn("Prefer use now the generate goal."); getLog().warn(""); - getLog().warn("See http://maven-site.nuiton.org/eugene/eugene-maven-plugin/generate-mojo.html"); - getLog().warn("See http://nuiton.org/issues/2251"); + getLog().warn("See http://doc.nuiton.org/eugene/eugene-maven-plugin/generate-mojo.html"); + getLog().warn("See http://forge.nuiton.org/issues/2251"); getLog().warn(""); getLog().warn("================================================================================"); Modified: trunk/eugene-maven-plugin/src/site/fr/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/eugene-maven-plugin/src/site/rst/index.rst =================================================================== (Binary files differ) Modified: trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst =================================================================== --- trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/eugene-plantuml-templates/src/site/fr/rst/index.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -85,7 +85,7 @@ .. image:: ../images/legend3.png .. _PlantUML : http://plantuml.sourceforge.net/index.html -.. _ObjectModel : http://maven-site.nuiton.org/eugene/02-objectmodel.html +.. _ObjectModel : http://doc.nuiton.org/eugene/02-objectmodel.html .. _Graphviz : http://www.graphviz.org/ .. _PlantUML Server : http://plantuml.com/plantuml/ .. _Pollen : http://maven-site.chorem.org/pollen/ Modified: trunk/src/site/fr/rst/03-generation.rst =================================================================== --- trunk/src/site/fr/rst/03-generation.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/src/site/fr/rst/03-generation.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -122,7 +122,7 @@ .. _ObjectModel: 02-objectmodel.html .. _syntaxe simple: 04-templates.html#Syntaxe_dcriture_dun_Generator -.. _Nuiton-processor: http://maven-site.nuiton.org/processor/nuiton-processor/index.html +.. _Nuiton-processor: http://doc.nuiton.org/processor/nuiton-processor/index.html .. _Writer: 06-fonctionnalites-avancees.html#Writer .. _ModelReader: 06-fonctionnalites-avancees.html#ModelReader Modified: trunk/src/site/fr/rst/07-glossaire.rst =================================================================== --- trunk/src/site/fr/rst/07-glossaire.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/src/site/fr/rst/07-glossaire.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -65,7 +65,7 @@ Ref : `Templates EUgene`_ , `librairie Nuiton-processor`_ .. _Templates EUGene: 04-templates.html -.. _librairie Nuiton-processor: http://maven-site.nuiton.org/processor +.. _librairie Nuiton-processor: http://doc.nuiton.org/processor Transformer ----------- Modified: trunk/src/site/rst/03-generation.rst =================================================================== --- trunk/src/site/rst/03-generation.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/src/site/rst/03-generation.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -118,7 +118,7 @@ .. _ObjectModel: 02-objectmodel.html .. _simple syntax: 04-templates.html#Generator_writing_syntax -.. _Nuiton-processor: http://maven-site.nuiton.org/processor/nuiton-processor/index.html +.. _Nuiton-processor: http://doc.nuiton.org/processor/nuiton-processor/index.html .. _Writer: 06-fonctionnalites-avancees.html#Writer .. _ModelReader: 06-fonctionnalites-avancees.html#ModelReader Modified: trunk/src/site/rst/07-glossaire.rst =================================================================== --- trunk/src/site/rst/07-glossaire.rst 2014-05-01 12:17:20 UTC (rev 1348) +++ trunk/src/site/rst/07-glossaire.rst 2014-05-04 10:58:54 UTC (rev 1349) @@ -64,7 +64,7 @@ Ref : `EUgene templates`_ , `Nuiton-processor library`_ .. _EUGene templates: 04-templates.html -.. _Nuiton-processor library: http://maven-site.nuiton.org/processor +.. _Nuiton-processor library: http://doc.nuiton.org/processor Transformer -----------