branch develop updated (769e22e -> c2615b7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git from 769e22e Add URL to ToPIA help page new a0952cb Use nuitonpom 10 new f0f10dd Use eugene 3.0-SNAPSHOT to get #3930) new b1a1515 Do not generate if mapping is already in class-path (See #3929) new c2615b7 Fixes #3929 Merge branch 'feature/3929' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c2615b744370c29398b27f6cb47bdf0590512de0 Merge: a0952cb b1a1515 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:13:04 2016 +0200 Fixes #3929 Merge branch 'feature/3929' into develop commit b1a1515c4cfd2dad3d160d237135a90c9d542cc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:13:02 2016 +0200 Do not generate if mapping is already in class-path (See #3929) commit f0f10ddda061f468f8a638ef780b5ca25650ef78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:09:36 2016 +0200 Use eugene 3.0-SNAPSHOT to get #3930) commit a0952cb41e550ad7bd02ca86ed832264487a1986 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 15:33:51 2016 +0200 Use nuitonpom 10 Summary of changes: pom.xml | 44 +++++++++--- src/site/site_fr.xml | 78 ++++++++++++++-------- .../templates/EntityHibernateMappingGenerator.java | 9 +++ 3 files changed, 95 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit a0952cb41e550ad7bd02ca86ed832264487a1986 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 15:33:51 2016 +0200 Use nuitonpom 10 --- pom.xml | 42 ++++++++++++++++++++++------ src/site/site_fr.xml | 78 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 85 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 236241f..8b20825 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>9</version> + <version>10</version> </parent> <artifactId>topia</artifactId> @@ -211,13 +211,6 @@ <url>https://gitlab.nuiton.org/nuiton/topia</url> </scm> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${site.url}</url> - </site> - </distributionManagement> - <properties> <!-- redmine project Id --> @@ -247,6 +240,7 @@ <sl4jVersion>1.7.18</sl4jVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> + <locales>fr</locales> <siteSourcesType>rst</siteSourcesType> <ciViewId>ToPIA</ciViewId> @@ -509,4 +503,36 @@ </pluginManagement> </build> + <profiles> + <!-- profile with all reports (include in release process) --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <!-- see https://forge.nuiton.org/issues/3346 --> + <report>index</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + </profile> + </profiles> + </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 14b9fc7..5b0243b 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -23,20 +23,45 @@ #L% --> -<project name="ToPIA"> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.3.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> <bannerLeft> - <src alt="ToPIA">${siteCommonResourcesUrl}/images/logos/topia_224_75.png</src> + <alt>ToPIA</alt> + <src>${siteCommonResourcesUrl}/images/logos/topia_224_75.png</src> <name>${project.name}</name> <href>index.html</href> </bannerLeft> <bannerRight> - <src alt="Code Lutin">lutinorange-codelutin.png</src> + <alt>Code Lutin</alt> + <src>https://www.codelutin.com/images/lutinorange-codelutin.png</src> <href>http://www.codelutin.com</href> </bannerRight> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <topBarIcon> + <name>ToPIA : Tools for Portable and Independent Architecture</name> + <alt>ToPIA : Tools for Portable and Independent Architecture</alt> + <src>${siteCommonResourcesUrl}/images/logos/topia_60_20.png</src> + <href>/index.html</href> + </topBarIcon> + <sideBarEnabled>false</sideBarEnabled> + <googleSearch>false</googleSearch> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right"/> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> @@ -54,30 +79,36 @@ <body> + <links> + <item name="Nuiton.org" href="https://forge.nuiton.org"/> + <item name="Nuiton.org (ToPIA)" href="https://forge.nuiton.org/projects/topia"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + </links> + <breadcrumbs> - <item name="${project.name}" - href="${project.url}/index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Tutoriels"> - <item name="Créer un projet ToPIA en partant de rien" href="tutos/from_scratch.html" /> - <item name="Migration vers ToPIA 3.0" href="migrate_to_3.0.html" /> - <item name="Comment personnaliser la génération de code ?" href="tutos/howto_customize_generation.html" /> - <item name="Comment intégrer ToPIA dans votre application ?" href="tutos/howto_architecture_with_topia.html" /> - <item name="Comment gérer les évolutions de schéma avec ToPIA ?" href="tutos/howto_migration_service.html" /> - <item name="Examples de migration pour le refonte des indexed/ordered" href="user/ordered_vs_indexed_migration.html" /> - <item name="[deprecated]Commencer à développer avec l'API ToPIA" href="user/start_using_api.html" /> - <item name="[deprecated]Étendre le modèle" href="user/extend_model.html" /> - <item name="[deprecated]Continuer le développement" href="user/continue_devel.html" /> + <item name="Créer un projet ToPIA en partant de rien" href="tutos/from_scratch.html"/> + <item name="Migration vers ToPIA 3.0" href="migrate_to_3.0.html"/> + <item name="Comment personnaliser la génération de code ?" href="tutos/howto_customize_generation.html"/> + <item name="Comment intégrer ToPIA dans votre application ?" href="tutos/howto_architecture_with_topia.html"/> + <item name="Comment gérer les évolutions de schéma avec ToPIA ?" href="tutos/howto_migration_service.html"/> + <item name="Examples de migration pour le refonte des indexed/ordered" + href="user/ordered_vs_indexed_migration.html"/> + <item name="[deprecated]Commencer à développer avec l'API ToPIA" href="user/start_using_api.html"/> + <item name="[deprecated]Étendre le modèle" href="user/extend_model.html"/> + <item name="[deprecated]Continuer le développement" href="user/continue_devel.html"/> </menu> <menu name="Documentation"> - <item name="Présentation" href="index.html" /> - <item name="Utilisation" href="user/howto.html" /> + <item name="Présentation" href="index.html"/> + <item name="Utilisation" href="user/howto.html"/> <item name="Génération des modèles" href="user/model_generation.html"/> - <item name="Tag values" href="user/tagvalues.html" /> + <item name="Tag values" href="user/tagvalues.html"/> <item name="FAQ" href="user/faq.html"/> <item name="Todo" href="docs/todo.html"/> <item name="Mapping Hibernate" href="docs/hibernate_mapping.html"/> @@ -88,20 +119,13 @@ <item name="Projets similaires" href="docs/project.html"/> <item name="Gestion des évènements" href="user/event.html"/> <item name="Qu'est-ce qu'un cycle de développement en Y ?" href="docs/y_cycle.html"/> - <item name="Détails de l'intégration avec Maven" href="docs/maven_integration.html" /> + <item name="Détails de l'intégration avec Maven" href="docs/maven_integration.html"/> </menu> <menu ref="modules"/> <menu ref="reports" name="Infos"/> - <links> - <item name="Nuiton.org" href="https://forge.nuiton.org"/> - <item name="Nuiton.org (ToPIA)" href="https://forge.nuiton.org/projects/topia"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> - </links> - <footer> <div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit f0f10ddda061f468f8a638ef780b5ca25650ef78 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:09:36 2016 +0200 Use eugene 3.0-SNAPSHOT to get #3930) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8b20825..9a2b267 100644 --- a/pom.xml +++ b/pom.xml @@ -218,7 +218,7 @@ <!-- libs version --> <commonsLoggingVersion>1.2</commonsLoggingVersion> - <eugeneVersion>3.0-alpha-4</eugeneVersion> + <eugeneVersion>3.0-SNAPSHOT</eugeneVersion> <flywayVersion>3.1</flywayVersion> <guavaVersion>19.0</guavaVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit b1a1515c4cfd2dad3d160d237135a90c9d542cc8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:13:02 2016 +0200 Do not generate if mapping is already in class-path (See #3929) --- .../nuiton/topia/templates/EntityHibernateMappingGenerator.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java index 1cded91..acdfee1 100644 --- a/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java +++ b/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java @@ -187,6 +187,10 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { return; } + if (fileFoundInClassPath(input)) { + return; + } + ObjectModelPackage aPackage = model.getPackage(input); ClassContext classContext = new ClassContext(model, aPackage, input); @@ -971,4 +975,9 @@ public class EntityHibernateMappingGenerator extends ObjectModelGenerator { }*/ } + protected boolean fileFoundInClassPath(ObjectModelClass input) { + String fqn = templateHelper.getDOType(input, model); + return getResourcesHelper().isFullyQualifiedNameInClassPath(fqn, ".hbm.xml"); + } + } //EntityHibernateMappingGenerator -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit c2615b744370c29398b27f6cb47bdf0590512de0 Merge: a0952cb b1a1515 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 8 17:13:04 2016 +0200 Fixes #3929 Merge branch 'feature/3929' into develop pom.xml | 2 +- .../nuiton/topia/templates/EntityHibernateMappingGenerator.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm