branch develop updated (7b41061 -> 7143f30)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 7b41061 fixes #5919: Migrates to git new 7143f30 update pom and site layout The 1 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 7143f307d7693cabb764f95cd48f26956020d8b1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 8 09:22:38 2014 +0100 update pom and site layout Summary of changes: pom.xml | 9 ++----- src/site/site_en.xml | 70 +++++++++------------------------------------------- src/site/site_fr.xml | 68 +++++++++----------------------------------------- 3 files changed, 24 insertions(+), 123 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 7143f307d7693cabb764f95cd48f26956020d8b1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 8 09:22:38 2014 +0100 update pom and site layout --- pom.xml | 9 ++----- src/site/site_en.xml | 70 +++++++++------------------------------------------- src/site/site_fr.xml | 68 +++++++++----------------------------------------- 3 files changed, 24 insertions(+), 123 deletions(-) diff --git a/pom.xml b/pom.xml index b9e8d97..825e30d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.3</version> + <version>1.6</version> </parent> <groupId>fr.ifremer</groupId> @@ -30,7 +30,7 @@ data. </description> <inceptionYear>2011</inceptionYear> - <url>https://doc.codelutin.com/echobase</url> + <url>https://echobase.codelutin.com</url> <organization> <name>Ifremer</name> @@ -166,15 +166,10 @@ <!--Site configuration --> <locales>fr,en</locales> - <!-- Can't use version 3.4 since jrst is not compatible --> - <!-- see https://forge.nuiton.org/issues/3342 --> - <sitePluginVersion>3.3</sitePluginVersion> <!-- name of embedded war file basename --> <embeddedWarName>echobase-embedded-${project.version}</embeddedWarName> - <!-- Release configuration --> - <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> </properties> <dependencyManagement> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index f1d50b0..d69d47e 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -24,71 +24,41 @@ 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"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - - <bannerLeft> - <name>${project.name}</name> - <src>${project.url}/images/echobase-logo.png</src> - <href>./index.html</href> - </bannerLeft> - <publishDate position="right" format="yyyy-MM-dd"/> <version position="right"/> <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.forge.codelutin.com/jrst" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.forge.codelutin.com/topia" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - <links> - <item name="Forge" href="http://www.forge.codelutin.com"/> + <item name="Forge" href="https://forge.codelutin.com"/> <item name="CodeLutin" href="http://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}/v/${siteDeployClassifier}/en/index.html"/> </breadcrumbs> <menu name="Language"> @@ -97,8 +67,7 @@ </menu> <menu name="Administration"> - <item name="Download" - href="http://forge.codelutin.com/projects/echobase/files"/> + <item name="Download" href="https://forge.codelutin.com/projects/echobase/files"/> <item name="Install" href="install.html"/> </menu> @@ -124,28 +93,11 @@ <menu name="Dev"> <item name="Model" href="model.html"/> - <item name="Roadmap" - href="http://forge.codelutin.com/projects/echobase/roadmap"/> + <item name="Roadmap" href="https://forge.codelutin.com/projects/echobase/roadmap"/> <item name="Changelogs" href="changes-report.html"/> </menu> <menu ref="reports"/> - <footer> - - <div id='projectMetas' - 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}' locale='en' - scmwebeditor_vmFiles=",install.html,usage.html," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index c30c796..28b35bf 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -24,72 +24,45 @@ 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"> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <bannerLeft> <name>${project.name}</name> <src>${project.url}/images/echobase-logo.png</src> <href>./index.html</href> </bannerLeft> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.forge.codelutin.com/jrst" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://maven-site.forge.codelutin.com/topia" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> - </head> - <links> - <item name="Forge" href="http://forge.codelutin.com"/> + <item name="Forge" href="https://forge.codelutin.com"/> <item name="CodeLutin" href="http://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}/v/${siteDeployClassifier}/en/index.html"/> </breadcrumbs> <menu name="Langue"> @@ -98,8 +71,7 @@ </menu> <menu name="Administration"> - <item name="Téléchargement" - href="http://forge.codelutin.com/projects/echobase/files"/> + <item name="Téléchargement" href="https://forge.codelutin.com/projects/echobase/files"/> <item name="Installation" href="install.html"/> </menu> @@ -125,29 +97,11 @@ <menu name="Dev"> <item name="Modèle" href="model.html"/> - <item name="Roadmap" - href="http://forge.codelutin.com/projects/echobase/roadmap"/> + <item name="Roadmap" href="https://forge.codelutin.com/projects/echobase/roadmap"/> <item name="Historique des versions" href="changes-report.html"/> </menu> <menu ref="reports"/> - <footer> - - <div id='projectMetas' - 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}' - locale='fr' - scmwebeditor_vmFiles=",install.html,usage.html," - scmwebeditor_skipDefaultFiles="true"> - </div> - </footer> </body> </project> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm