From tchemit@users.nuiton.org Tue Feb 4 08:53:18 2014 From: tchemit@users.nuiton.org To: eugene-commits@list.nuiton.org Subject: [Eugene-commits] r1314 - in trunk: . eugene/src/main/java/org/nuiton/eugene/java eugene/src/site eugene-java-templates/src/site eugene-maven-plugin/src/site eugene-plantuml-templates/src/site src/site Date: Tue, 04 Feb 2014 08:53:18 +0100 Message-ID: <20140204075318.9A0B2184B19@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8248323707459886157==" --===============8248323707459886157== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/ObjectModelTransformerTo= Java.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/ObjectModelTransf= ormerToJava.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerT= oJava.java 2013-11-08 09:28:31 UTC (rev 1313) +++ trunk/eugene/src/main/java/org/nuiton/eugene/java/ObjectModelTransformerT= oJava.java 2014-02-04 07:53:18 UTC (rev 1314) @@ -954,7 +954,7 @@ =20 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -74,8 +74,8 @@ =20 - + href=3D"${mavenpomSiteCommonResourcesUrl}/processor"/> + =20 @@ -91,7 +91,8 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -86,8 +86,8 @@ =20 - + href=3D"${mavenpomSiteCommonResourcesUrl}/processor"/> + =20 @@ -103,7 +103,8 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene-java-templates/src/site/site_en.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -66,7 +66,8 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene-java-templates/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -70,7 +70,8 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene-maven-plugin/src/site/site_en.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/eugene-maven-plugin/src/site/site_en.xml 2013-11-08 09:28:31 UTC (r= ev 1313) +++ trunk/eugene-maven-plugin/src/site/site_en.xml 2014-02-04 07:53:18 UTC (r= ev 1314) @@ -34,7 +34,7 @@ =20 =20 @@ -73,7 +73,9 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_vmFiles=3D",example.html," + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene-maven-plugin/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/eugene-maven-plugin/src/site/site_fr.xml 2013-11-08 09:28:31 UTC (r= ev 1313) +++ trunk/eugene-maven-plugin/src/site/site_fr.xml 2014-02-04 07:53:18 UTC (r= ev 1314) @@ -34,7 +34,7 @@ =20 =20 @@ -77,7 +77,9 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_vmFiles=3D",example.html," + scmwebeditor_skipDefaultFiles=3D"true"> =20 Modified: trunk/eugene-plantuml-templates/src/site/site_en.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -57,17 +57,18 @@ =20
=20 -
-
+
+
=20 Modified: trunk/eugene-plantuml-templates/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 =20 @@ -61,17 +61,18 @@ =20
=20 -
-
+
+
=20 Modified: trunk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ org.nuiton mavenpom4redmineAndCentral - 4.1 + 4.6 =20 eugene @@ -128,12 +128,12 @@ eugene-yaml-templates =20 - - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + =20 + scm:svn:https://nuiton.org/svn/eugene/trunk - scm:svn:http://svn.nuiton.org/svn/eugene/trunk + scm:svn:https://nuiton.org/svn/eugene/trunk - http://nuiton.org/projects/eugene/repository/show/trunk + https://nuiton.org/projects/eugene/repository/show/trunk @@ -147,8 +147,8 @@ eugene =20 1.3 - 2.7.1 - 2.5 + 3.0-SNAPSHOT + 3.0-SNAPSHOT =20 en,fr Modified: trunk/src/site/site_en.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.0 + ${fluidoSkinVersion} =20 @@ -57,12 +57,12 @@ =20 - + img=3D"${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven= -feather.png"/> + + img=3D"${mavenpomSiteCommonResourcesUrl}/public/images/logos/restr= ucturedtext-logo.png"/> =20 @@ -73,7 +73,7 @@ =20 =20 @@ -105,8 +105,8 @@ =20 - + href=3D"${mavenpomSiteCommonResourcesUrl}/processor"/> + @@ -127,7 +127,9 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_vmFiles=3D",05-execution.html," + scmwebeditor_skipDefaultFiles=3D"true"> Modified: trunk/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ org.apache.maven.skins maven-fluido-skin - 1.3.0 + ${fluidoSkinVersion} =20 @@ -57,12 +57,12 @@ =20 - + img=3D"${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven= -feather.png"/> + + img=3D"${mavenpomSiteCommonResourcesUrl}/public/images/logos/restr= ucturedtext-logo.png"/> =20 @@ -73,7 +73,7 @@ =20 =20 @@ -106,8 +106,8 @@ =20 - + href=3D"${mavenpomSiteCommonResourcesUrl}/processor"/> + @@ -134,7 +134,9 @@ scmwebeditorurl=3D'${project.scmwebeditorUrl}' siteSourcesType=3D'${project.siteSourcesType}' piwikEnabled=3D'${project.piwikEnabled}' - piwikId=3D'${project.piwikId}'> + piwikId=3D'${project.piwikId}' + scmwebeditor_vmFiles=3D",05-execution.html," + scmwebeditor_skipDefaultFiles=3D"true"> --===============8248323707459886157==--