This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jredmine. See http://git.nuiton.org/jredmine.git commit b1dc3b60a67717b406255809f32c43c73c5c23b9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jun 7 13:58:25 2014 +0200 refs #3255 fix site url + use site xsd --- jredmine-client/src/site/site_fr.xml | 8 +++++--- .../org/nuiton/jredmine/plugin/AbstractRedmineMojo.java | 12 ++++++------ jredmine-maven-plugin/src/site/site_fr.xml | 8 +++++--- src/site/site_fr.xml | 13 ++++++++----- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/jredmine-client/src/site/site_fr.xml b/jredmine-client/src/site/site_fr.xml index 5d6c2ce..c3d562a 100644 --- a/jredmine-client/src/site/site_fr.xml +++ b/jredmine-client/src/site/site_fr.xml @@ -24,7 +24,9 @@ #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> @@ -35,11 +37,11 @@ <head> <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <breadcrumbs> diff --git a/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java b/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java index 909f995..64e6622 100644 --- a/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java +++ b/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/AbstractRedmineMojo.java @@ -123,16 +123,12 @@ public abstract class AbstractRedmineMojo extends AbstractPlugin implements Redm @Parameter(property = "redmine.safe", defaultValue = "true") protected boolean safe; - /////////////////////////////////////////////////////////////////////////// - /// Mojo components - /////////////////////////////////////////////////////////////////////////// - /** * Current project. * * @since 1.0.0 */ - @Component + @Parameter(defaultValue = "${project}", readonly = true) protected MavenProject project; /** @@ -140,9 +136,13 @@ public abstract class AbstractRedmineMojo extends AbstractPlugin implements Redm * * @since 1.0.0 */ - @Component + @Parameter(defaultValue = "${session}", readonly = true) protected MavenSession session; + /////////////////////////////////////////////////////////////////////////// + /// Mojo components + /////////////////////////////////////////////////////////////////////////// + /** * Redmine service. * diff --git a/jredmine-maven-plugin/src/site/site_fr.xml b/jredmine-maven-plugin/src/site/site_fr.xml index feccc6d..c2dbe7c 100644 --- a/jredmine-maven-plugin/src/site/site_fr.xml +++ b/jredmine-maven-plugin/src/site/site_fr.xml @@ -24,7 +24,9 @@ #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> @@ -35,11 +37,11 @@ <head> <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> </script> <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> <breadcrumbs> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index ac43332..07ec59f 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -25,7 +25,9 @@ --> -<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> @@ -72,16 +74,17 @@ href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> </head> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> - <links> <item name="nuiton.org" href="http://www.nuiton.org"/> <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"/> + </breadcrumbs> + + <menu name="Utilisateur"> <item name="Introduction" href="index.html"/> <item name="Tests" href="tests.html"/> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.