[I18n-commits] 01/01: refs-90 #3322

20 Jul 2014

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository i18n.

See http://git.nuiton.org/i18n.git

commit f389b225a902326d99c3043a3883b7b3a300b53c
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Sun Jul 20 16:46:24 2014 +0200

    refs-90 #3322
---
 i18n-maven-plugin/pom.xml               | 24 --------------
 i18n-maven-plugin/src/site/site_en.xml  | 22 +------------
 i18n-maven-plugin/src/site/site_fr.xml  | 22 +------------
 nuiton-i18n-editor/src/site/site_fr.xml |  2 +-
 nuiton-i18n/src/site/site_en.xml        | 21 +------------
 nuiton-i18n/src/site/site_fr.xml        | 33 +------------------
 pom.xml                                 | 56 ++++++++++++++++++++++++++++++---
 src/site/site_en.xml                    | 11 ++++---
 src/site/site_fr.xml                    | 31 ++++++------------
 9 files changed, 72 insertions(+), 150 deletions(-)

diff --git a/i18n-maven-plugin/pom.xml b/i18n-maven-plugin/pom.xml
index e6bdfa7..b941e08 100644
--- a/i18n-maven-plugin/pom.xml
+++ b/i18n-maven-plugin/pom.xml
@@ -202,30 +202,6 @@
         <plugins>
 
           <plugin>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>${projectInfoReportsPluginVersion}</version>
-            <reportSets>
-              <reportSet>
-                <reports>
-                  <report>project-team</report>
-                  <report>mailing-list</report>
-                  <report>cim</report>
-                  <report>issue-tracking</report>
-                  <report>license</report>
-                  <report>scm</report>
-                  <report>dependency-info</report>
-                  <report>dependencies</report>
-                  <report>dependency-convergence</report>
-                  <report>plugin-management</report>
-                  <report>plugins</report>
-                  <report>dependency-management</report>
-                  <report>summary</report>
-                </reports>
-              </reportSet>
-            </reportSets>
-          </plugin>
-
-          <plugin>
             <artifactId>maven-plugin-plugin</artifactId>
             <version>${pluginPluginVersion}</version>
           </plugin>
diff --git a/i18n-maven-plugin/src/site/site_en.xml b/i18n-maven-plugin/src/site/site_en.xml
index 9a6e2eb..15ae251 100644
--- a/i18n-maven-plugin/src/site/site_en.xml
+++ b/i18n-maven-plugin/src/site/site_en.xml
@@ -34,12 +34,9 @@
   <body>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -85,22 +82,5 @@
 
     <menu ref="reports"/>
 
-    <footer>
-
-      <div id='projectMetas' locale='en'
-           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}'
-           scmwebeditor_skipDefaultFiles="true">
-        <!--scmwebeditor_vmFiles=",library.html,"-->
-      </div>
-    </footer>
-
   </body>
 </project>
diff --git a/i18n-maven-plugin/src/site/site_fr.xml b/i18n-maven-plugin/src/site/site_fr.xml
index 8634ddd..4d1c7c9 100644
--- a/i18n-maven-plugin/src/site/site_fr.xml
+++ b/i18n-maven-plugin/src/site/site_fr.xml
@@ -34,12 +34,9 @@
   <body>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -83,22 +80,5 @@
 
     <menu ref="reports"/>
 
-    <footer>
-
-      <div id='projectMetas' locale='fr'
-           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}'
-           scmwebeditor_skipDefaultFiles="true">
-        <!--scmwebeditor_vmFiles=",library.html,"-->
-      </div>
-    </footer>
-
   </body>
 </project>
diff --git a/nuiton-i18n-editor/src/site/site_fr.xml b/nuiton-i18n-editor/src/site/site_fr.xml
index d2233e8..0efc98e 100644
--- a/nuiton-i18n-editor/src/site/site_fr.xml
+++ b/nuiton-i18n-editor/src/site/site_fr.xml
@@ -18,7 +18,7 @@
     </bannerRight>
 
     <poweredBy>
-        <logo href="${mavenpomSiteCommonResourcesUrl}/jaxx" name="JAXX" img="images/jaxx-logo.png"/>
+        <logo href="${siteCommonResourcesUrl}/jaxx" name="JAXX" img="images/jaxx-logo.png"/>
         <logo href="http://jrst.labs.libre-entreprise.org/jrst" name="JRst"
               img="images/jrst-logo.png"/>
 
diff --git a/nuiton-i18n/src/site/site_en.xml b/nuiton-i18n/src/site/site_en.xml
index 894f066..9f16d9e 100644
--- a/nuiton-i18n/src/site/site_en.xml
+++ b/nuiton-i18n/src/site/site_en.xml
@@ -34,12 +34,9 @@
   <body>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -78,21 +75,5 @@
 
     <menu ref="reports"/>
 
-    <footer>
-
-      <div id='projectMetas' locale='en'
-           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}'
-           scmwebeditor_skipDefaultFiles="true">
-      </div>
-    </footer>
-
   </body>
 </project>
diff --git a/nuiton-i18n/src/site/site_fr.xml b/nuiton-i18n/src/site/site_fr.xml
index 5b839e5..47250e6 100644
--- a/nuiton-i18n/src/site/site_fr.xml
+++ b/nuiton-i18n/src/site/site_fr.xml
@@ -34,12 +34,9 @@
   <body>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -62,35 +59,7 @@
       <item name="Accueil" href="index.html"/>
     </menu>
 
-    <menu name="Téléchargement">
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar"
-        name="Librairie (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar"
-        name="Javadoc (jar)"/>
-      <item
-        href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar"
-        name="Sources (jar)"/>
-    </menu>
-
     <menu ref="reports"/>
 
-    <footer>
-
-      <div id='projectMetas' locale='fr'
-           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}'
-           scmwebeditor_skipDefaultFiles="true">
-      </div>
-    </footer>
-
   </body>
 </project>
diff --git a/pom.xml b/pom.xml
index 4491902..d4edb2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,8 @@
 
   <parent>
     <groupId>org.nuiton</groupId>
-    <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>5.1-SNAPSHOT</version>
+    <artifactId>nuitonpom</artifactId>
+    <version>1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>i18n</artifactId>
@@ -52,16 +52,16 @@
     </developerConnection>
     <url>https://gitweb.nuiton.org/i18n.git</url>
   </scm>
+
   <distributionManagement>
     <site>
-      <id>${siteDeployId}</id>
-      <url>${siteDeployUrl}</url>
+      <id>${site.server}</id>
+      <url>${site.url}</url>
     </site>
   </distributionManagement>
 
   <properties>
 
-    <!-- pour un muli module on doit fixer le projectId -->
     <projectId>i18n</projectId>
 
     <processorVersion>1.3</processorVersion>
@@ -70,12 +70,58 @@
     <!--Multilanguage maven-site -->
     <locales>fr,en</locales>
 
+    <mavenVersion>2.2.1</mavenVersion>
+
   </properties>
 
   <dependencyManagement>
     <dependencies>
 
       <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
+        <version>4.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.3.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>2.4</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.11</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-runtime</artifactId>
         <version>${antlrVersion}</version>
diff --git a/src/site/site_en.xml b/src/site/site_en.xml
index 21d7f14..7239cb7 100644
--- a/src/site/site_en.xml
+++ b/src/site/site_en.xml
@@ -49,6 +49,10 @@
       <sideBarEnabled>true</sideBarEnabled>
       <searchEnabled>true</searchEnabled>
       <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+      <piwik>
+        <piwikUrl>http://piwik.codelutin.com</piwikUrl>
+        <idsite>${project.piwikId}</idsite>
+      </piwik>
     </fluidoSkin>
   </custom>
 
@@ -63,16 +67,15 @@
   <body>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
       <item name="${project.name}" href="index.html"/>
+      <item name="${project.version}"
+            href="${project.url}/${siteDeployClassifier}/index.html"/>
     </breadcrumbs>
 
     <menu name="Language">
diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml
index 069f02a..d00eb8b 100644
--- a/src/site/site_fr.xml
+++ b/src/site/site_fr.xml
@@ -49,6 +49,10 @@
       <sideBarEnabled>true</sideBarEnabled>
       <searchEnabled>true</searchEnabled>
       <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled>
+      <piwik>
+        <piwikUrl>http://piwik.codelutin.com</piwikUrl>
+        <idsite>${project.piwikId}</idsite>
+      </piwik>
     </fluidoSkin>
   </custom>
 
@@ -57,26 +61,25 @@
 
   <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>
 
     <head>
-      <script type="text/javascript"
-              src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js">
-      </script>
 
       <link rel="stylesheet" type="text/css"
-            href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
+            href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
       <item name="${project.name}" href="index.html"/>
+      <item name="${project.version}"
+            href="${project.url}/${siteDeployClassifier}/index.html"/>
     </breadcrumbs>
 
     <links>
-      <item name="nuiton.org" href="https://nuiton.org"/>
+      <item name="nuiton.org" href="https://forge.nuiton.org"/>
       <item name="CodeLutin" href="http://codelutin.com"/>
       <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/>
     </links>
@@ -108,21 +111,5 @@
 
     <menu ref="reports"/>
 
-    <footer>
-
-      <div id='projectMetas' locale='fr'
-           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}'
-           scmwebeditor_vmFiles=",library.html,"
-           scmwebeditor_skipDefaultFiles="true">
-      </div>
-    </footer>
   </body>
 </project>

-- 
To stop receiving notification emails like this one, please contact
nuiton.org SCM administrator <admin+scm@nuiton.org>.

    

[I18n-commits] 01/01: refs-90 #3322

nuiton.org scm