This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository vradi. See http://git.chorem.org/vradi.git commit 9a4e396f2c34b8e1b208580e28cd51b45cc4c17b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 28 09:20:03 2014 +0100 fixes #1132: Migrates to git (fix site generation) --- pom.xml | 1 + src/site/site.xml | 88 ++++++++++++++++++++++ src/site/site_fr.xml | 71 ----------------- vradi-entities/src/site/{site_fr.xml => site.xml} | 33 ++++---- .../src/site/{site_fr.xml => site.xml} | 33 ++++---- vradi-services/src/site/{site_fr.xml => site.xml} | 33 ++++---- vradi-swing/src/site/{site_fr.xml => site.xml} | 35 +++++---- vradi-web/pom.xml | 3 + .../site_fr.xml => vradi-web/src/site/site.xml | 39 +++++----- 9 files changed, 186 insertions(+), 150 deletions(-) diff --git a/pom.xml b/pom.xml index 363fa6a..56dee1f 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,7 @@ <!-- license to use --> <license.licenseName>agpl_v3</license.licenseName> + <locales>fr</locales> <!--<!– i18n configuration –>--> <!--<i18n.bundles>fr_FR,en_GB</i18n.bundles>--> <!--<i18n.silent>true</i18n.silent>--> diff --git a/src/site/site.xml b/src/site/site.xml new file mode 100644 index 0000000..53758b4 --- /dev/null +++ b/src/site/site.xml @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Vradi + %% + Copyright (C) 2009 - 2010 Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <!--src>${site.home.url}/jaxx.png</src--> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" + name="ReStructuredText" img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + </poweredBy> + + <body> + + <links> + <item name="nuiton.org" href="https://forge.nuiton.org"/> + <item name="chorem.org" href="https://forge.chorem.org"/> + <item name="CodeLutin" href="https://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}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Lancement" href="lancement.html"/> + <item name="Gérer les clients" href="clients.html"/> + <item name="Gérer les groupes/profils" href="groups.html"/> + <item name="Gérer les types de formulaire" href="formulaires.html"/> + <item name="Gérer les flux XML" href="fluxXML.html"/> + <item name="Gérer le thésaurus" href="thesaurus.html"/> + <item name="Traiter les formulaires" href="processForms.html"/> + <item name="Envoyer les formulaires" href="sendEmails.html"/> + <!--item name="Import/export" href="importExport.html"/--> + </menu> + + <menu name="Points généraux"> + <item name="Les requêtes" href="requests.html"/> + <item name="La génération PDF" href="generationPDF.html"/> + </menu> + + <menu name="Développeur"> + <item name="Flux XMLs" href="devel/xmlStream.html"/> + <item name="Roadmap" href="roadmap.html"/> + </menu> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml deleted file mode 100644 index fc7c63c..0000000 --- a/src/site/site_fr.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Vradi - %% - Copyright (C) 2009 - 2010 Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> - -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <!--src>${site.home.url}/jaxx.png</src--> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <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"/> - </poweredBy> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Lancement" href="lancement.html"/> - <item name="Gérer les clients" href="clients.html"/> - <item name="Gérer les groupes/profils" href="groups.html"/> - <item name="Gérer les types de formulaire" href="formulaires.html"/> - <item name="Gérer les flux XML" href="fluxXML.html"/> - <item name="Gérer le thésaurus" href="thesaurus.html"/> - <item name="Traiter les formulaires" href="processForms.html"/> - <item name="Envoyer les formulaires" href="sendEmails.html"/> - <!--item name="Import/export" href="importExport.html"/--> - </menu> - - <menu name="Points généraux"> - <item name="Les requêtes" href="requests.html"/> - <item name="La génération PDF" href="generationPDF.html"/> - </menu> - - <menu name="Développeur"> - <item name="Flux XMLs" href="devel/xmlStream.html"/> - <item name="Roadmap" href="roadmap.html"/> - </menu> - - <menu ref="modules"/> - - <menu ref="reports"/> - </body> -</project> diff --git a/vradi-entities/src/site/site_fr.xml b/vradi-entities/src/site/site.xml similarity index 56% rename from vradi-entities/src/site/site_fr.xml rename to vradi-entities/src/site/site.xml index 0544af5..a7ba5ce 100644 --- a/vradi-entities/src/site/site_fr.xml +++ b/vradi-entities/src/site/site.xml @@ -20,26 +20,29 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <menu ref="parent"/> + <menu ref="parent"/> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + </body> </project> diff --git a/vradi-services-web/src/site/site_fr.xml b/vradi-services-web/src/site/site.xml similarity index 56% rename from vradi-services-web/src/site/site_fr.xml rename to vradi-services-web/src/site/site.xml index d02d60a..388fe05 100644 --- a/vradi-services-web/src/site/site_fr.xml +++ b/vradi-services-web/src/site/site.xml @@ -20,26 +20,29 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <menu ref="parent"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <menu ref="parent"/> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + </body> </project> diff --git a/vradi-services/src/site/site_fr.xml b/vradi-services/src/site/site.xml similarity index 56% copy from vradi-services/src/site/site_fr.xml copy to vradi-services/src/site/site.xml index ca24471..472e660 100644 --- a/vradi-services/src/site/site_fr.xml +++ b/vradi-services/src/site/site.xml @@ -20,26 +20,29 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <menu ref="parent"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <menu ref="parent"/> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + </body> </project> diff --git a/vradi-swing/src/site/site_fr.xml b/vradi-swing/src/site/site.xml similarity index 56% rename from vradi-swing/src/site/site_fr.xml rename to vradi-swing/src/site/site.xml index 64630f3..d7adc43 100644 --- a/vradi-swing/src/site/site_fr.xml +++ b/vradi-swing/src/site/site.xml @@ -20,26 +20,29 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <menu ref="parent"/> + <menu ref="parent"/> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <menu ref="reports"/> - <menu ref="reports"/> - - </body> + </body> </project> diff --git a/vradi-web/pom.xml b/vradi-web/pom.xml index c1039e9..72a3ff4 100644 --- a/vradi-web/pom.xml +++ b/vradi-web/pom.xml @@ -25,6 +25,9 @@ <i18n.bundleOutputName>vradi-i18n</i18n.bundleOutputName> <i18n.bundleOutputPackage/> + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + </properties> <dependencies> diff --git a/vradi-services/src/site/site_fr.xml b/vradi-web/src/site/site.xml similarity index 54% rename from vradi-services/src/site/site_fr.xml rename to vradi-web/src/site/site.xml index ca24471..9c7da00 100644 --- a/vradi-services/src/site/site_fr.xml +++ b/vradi-web/src/site/site.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Vradi :: Services + Vradi :: Web %% Copyright (C) 2009 - 2010 Codelutin %% @@ -9,37 +9,40 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<project name="${project.name}"> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <body> + <body> - <menu ref="parent"/> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <menu ref="parent"/> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + </menu> - <menu ref="reports"/> + <menu ref="reports"/> - </body> + </body> </project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.