Author: tchemit Date: 2014-02-04 08:53:18 +0100 (Tue, 04 Feb 2014) New Revision: 1314 Url: http://nuiton.org/projects/eugene/repository/revisions/1314 Log: fixes #3045: Updates mavenpom to 4.6 refs #3046: updates nuiton-utils to 3.0 refs #3047: updates I18N to 3.0 Modified: trunk/eugene-java-templates/src/site/site_en.xml trunk/eugene-java-templates/src/site/site_fr.xml trunk/eugene-maven-plugin/src/site/site_en.xml trunk/eugene-maven-plugin/src/site/site_fr.xml trunk/eugene-plantuml-templates/src/site/site_en.xml trunk/eugene-plantuml-templates/src/site/site_fr.xml trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java trunk/eugene/src/site/site_en.xml trunk/eugene/src/site/site_fr.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerToJava.java 2014-02-04 07:53:18 UTC (rev 1314) @@ -954,7 +954,7 @@ protected void addI18n(StringBuilder buffer, String i18nPrefix, String suffix) { - buffer.append("\n I18n.n_(\""); + buffer.append("\n I18n.n(\""); buffer.append(i18nPrefix); buffer.append(suffix); buffer.append("\");"); Modified: trunk/eugene/src/site/site_en.xml =================================================================== --- trunk/eugene/src/site/site_en.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene/src/site/site_en.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -74,8 +74,8 @@ <menu name="Links"> <item name="Nuiton-processor" - href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + href="${mavenpomSiteCommonResourcesUrl}/processor"/> + <item name="ToPIA" href="${mavenpomSiteCommonResourcesUrl}/topia"/> </menu> <menu ref="reports"/> @@ -91,7 +91,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene/src/site/site_fr.xml =================================================================== --- trunk/eugene/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -86,8 +86,8 @@ <menu name="Liens"> <item name="Nuiton-processor" - href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + href="${mavenpomSiteCommonResourcesUrl}/processor"/> + <item name="ToPIA" href="${mavenpomSiteCommonResourcesUrl}/topia"/> </menu> <menu ref="reports"/> @@ -103,7 +103,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene-java-templates/src/site/site_en.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_en.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-java-templates/src/site/site_en.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -66,7 +66,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene-java-templates/src/site/site_fr.xml =================================================================== --- trunk/eugene-java-templates/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-java-templates/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -70,7 +70,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene-maven-plugin/src/site/site_en.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_en.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-maven-plugin/src/site/site_en.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -73,7 +73,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",example.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/eugene-maven-plugin/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-maven-plugin/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -77,7 +77,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",example.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> Modified: trunk/eugene-plantuml-templates/src/site/site_en.xml =================================================================== --- trunk/eugene-plantuml-templates/src/site/site_en.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-plantuml-templates/src/site/site_en.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -57,17 +57,18 @@ <footer> - <div id='projectMetas' locale='en' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> + <div id='projectMetas' locale='en' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> + </div> </footer> </body> Modified: trunk/eugene-plantuml-templates/src/site/site_fr.xml =================================================================== --- trunk/eugene-plantuml-templates/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene-plantuml-templates/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -34,7 +34,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -61,17 +61,18 @@ <footer> - <div id='projectMetas' locale='fr' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> + <div id='projectMetas' locale='fr' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.developerConnection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles="true"> + </div> </footer> </body> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/pom.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.1</version> + <version>4.6</version> </parent> <artifactId>eugene</artifactId> @@ -128,12 +128,12 @@ <module>eugene-yaml-templates</module> </modules> - <scm> <!-- TODO AThimel 08/11/2013 Use HTTPS as soon as available --> - <connection>scm:svn:http://svn.nuiton.org/svn/eugene/trunk</connection> + <scm> + <connection>scm:svn:https://nuiton.org/svn/eugene/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:https://nuiton.org/svn/eugene/trunk </developerConnection> - <url>http://nuiton.org/projects/eugene/repository/show/trunk</url> + <url>https://nuiton.org/projects/eugene/repository/show/trunk</url> </scm> <distributionManagement> <site> @@ -147,8 +147,8 @@ <projectId>eugene</projectId> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonUtilsVersion>2.7.1</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> <!--Multilanguage maven-site --> <locales>en,fr</locales> Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/src/site/site_en.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -57,12 +57,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + <logo href="${mavenpomSiteCommonResourcesUrl}/jrst/" name="JRst" + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -73,7 +73,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -105,8 +105,8 @@ <menu name="Links"> <item name="Nuiton-processor" - href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + href="${mavenpomSiteCommonResourcesUrl}/processor"/> + <item name="ToPIA" href="${mavenpomSiteCommonResourcesUrl}/topia"/> <item name="ArgoUML" href="http://argouml.tigris.org/"/> <item name="UML" href="http://www.uml.org/"/> <item name="XMI" href="http://www.omg.org/spec/XMI/"/> @@ -127,7 +127,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",05-execution.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (rev 1314) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.3.0</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> @@ -57,12 +57,12 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> - <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + <logo href="${mavenpomSiteCommonResourcesUrl}/jrst/" name="JRst" + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> + img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> @@ -73,7 +73,7 @@ <head> <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> + src="${mavenpomSiteCommonResourcesUrl}/public/js/maven-site-nuiton.org.js"> </script> </head> @@ -106,8 +106,8 @@ <menu name="Liens"> <item name="Nuiton-processor" - href="http://maven-site.nuiton.org/processor"/> - <item name="ToPIA" href="http://maven-site.nuiton.org/topia"/> + href="${mavenpomSiteCommonResourcesUrl}/processor"/> + <item name="ToPIA" href="${mavenpomSiteCommonResourcesUrl}/topia"/> <item name="ArgoUML" href="http://argouml.tigris.org/"/> <item name="UML" href="http://www.uml.org/"/> <item name="XMI" href="http://www.omg.org/spec/XMI/"/> @@ -134,7 +134,9 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_vmFiles=",05-execution.html," + scmwebeditor_skipDefaultFiles="true"> </div> </footer> </body>