This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 02a31c19047815685260e0754b86feeb9d206fb7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Oct 18 09:13:37 2014 +0200 fixes #3534: Use nuitonpom 1.3 --- jrst-doc/src/site/site_en.xml | 43 ++++++++++----------------------- jrst-doc/src/site/site_fr.xml | 45 ++++++++++------------------------- pom.xml | 2 +- src/site/site_en.xml | 48 +++++++------------------------------ src/site/site_fr.xml | 55 +++++++------------------------------------ 5 files changed, 42 insertions(+), 151 deletions(-) diff --git a/jrst-doc/src/site/site_en.xml b/jrst-doc/src/site/site_en.xml index e9f5812..2eb2ffb 100644 --- a/jrst-doc/src/site/site_en.xml +++ b/jrst-doc/src/site/site_en.xml @@ -27,11 +27,13 @@ <project name="${project.name}"> <poweredBy> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" - img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + + <logo href="http://doc.nuiton.org/jrst" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + </poweredBy> <bannerLeft> @@ -70,33 +72,12 @@ </menu> <menu name="Community"> - <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> - <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> - <item name="Continuous integration" - href="http://hudson.nuiton.org/hudson/job/jrst"/> - <item name="Code analysis" - href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + <item name="Bugtracker" href="https://forge.nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="https://forge.nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="https://forge.nuiton.org/projects/jrst/files"/> + <item name="Continuous integration" href="http://ci.nuiton.org/jenkins/job/jrst-ci"/> + <item name="Code analysis" href="http://qa.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> </project> diff --git a/jrst-doc/src/site/site_fr.xml b/jrst-doc/src/site/site_fr.xml index 5577429..3c32fdd 100644 --- a/jrst-doc/src/site/site_fr.xml +++ b/jrst-doc/src/site/site_fr.xml @@ -27,11 +27,13 @@ <project name="${project.name}"> <poweredBy> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" - img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" - name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + + <logo href="http://doc.nuiton.org/jrst" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + </poweredBy> <bannerLeft> @@ -69,35 +71,12 @@ </menu> <menu name="Communauté"> - <item name="Suivi des bugs" - href="http://nuiton.org/projects/jrst/issues"/> - <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Téléchargements" - href="http://nuiton.org/projects/jrst/files"/> - <item name="Intégration continue" - href="http://hudson.nuiton.org/hudson/job/jrst"/> - <item name="Analyse du code" - href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + <item name="Suivi des bugs" href="https://forge.nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="https://forge.nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" href="https://forge.nuiton.org/projects/jrst/files"/> + <item name="Intégration continue" href="http://ci.nuiton.org/jenkins/job/jrst-ci"/> + <item name="Analyse du code" href="http://qa.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> - </body> </project> diff --git a/pom.xml b/pom.xml index 922e28d..a068125 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ <jaxxVersion>2.13</jaxxVersion> <mavenVersion>2.2.1</mavenVersion> - <!-- i18n configuration --> + <!-- site configuration --> <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 3da4511..e26bf9e 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -25,21 +25,6 @@ --> <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> <bannerLeft> <name>${project.name}</name> @@ -53,12 +38,13 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> <body> <breadcrumbs> - <item name="${project.name}" href="index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <links> @@ -73,11 +59,11 @@ </menu> <menu name="Community"> - <item name="Bugtracker" href="http://nuiton.org/projects/jrst/issues"/> - <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Downloads" href="http://nuiton.org/projects/jrst/files"/> - <item name="Continuous integration" href="http://hudson.nuiton.org/hudson/job/jrst"/> - <item name="Code analysis" href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + <item name="Bugtracker" href="https://forge.nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="https://forge.nuiton.org/projects/roadmap/jrst"/> + <item name="Downloads" href="https://forge.nuiton.org/projects/jrst/files"/> + <item name="Continuous integration" href="http://ci.nuiton.org/jenkins/job/jrst-ci"/> + <item name="Code analysis" href="http://qa.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> <!--<menu ref="modules"/>--> @@ -91,23 +77,5 @@ <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 9cb6e06..f2c3f51 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -26,22 +26,6 @@ <project name="${project.name}"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <bannerLeft> <name>${project.name}</name> <href>/</href> @@ -54,19 +38,20 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> <body> <links> - <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Nuiton.org" href="http://forge.nuiton.org"/> <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="index.html"/> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Langue"> @@ -75,38 +60,16 @@ </menu> <menu name="Communauté"> - <item name="Suivi des bugs" - href="http://nuiton.org/projects/jrst/issues"/> - <item name="Roadmap" href="http://nuiton.org/projects/roadmap/jrst"/> - <item name="Téléchargements" - href="http://nuiton.org/projects/jrst/files"/> - <item name="Intégration continue" - href="http://hudson.nuiton.org/hudson/job/jrst"/> - <item name="Analyse du code" - href="http://sonar.nuiton.org/sonar/project/index/org.nuiton:jrst"/> + <item name="Suivi des bugs" href="https://forge.nuiton.org/projects/jrst/issues"/> + <item name="Roadmap" href="https://forge.nuiton.org/projects/roadmap/jrst"/> + <item name="Téléchargements" href="https://forge.nuiton.org/projects/jrst/files"/> + <item name="Intégration continue" href="http://ci.nuiton.org/jenkins/job/jrst-ci"/> + <item name="Analyse du code" href="http://qa.nuiton.org/sonar/project/index/org.nuiton:jrst"/> </menu> <menu ref="modules"/> <menu ref="reports"/> - <footer> - - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - - <div id='projectMetas' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.connection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> - </div> - </footer> </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.