r1165 - in trunk: mavenpom4labs mavenpom4labs/src/site mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral mavenpom4redmine/mavenpom4redmineAndCentral/src/site mavenpom4redmine/src/site src/site - Mavenpom-commits

9 Sep 2011

Author: tchemit
Date: 2011-09-09 16:25:40 +0200 (Fri, 09 Sep 2011)
New Revision: 1165

Url: http://nuiton.org/repositories/revision/mavenpom/1165

Log:
Anomalie #1733: Can't deploy multi locale site + fix (but still not working everywhere...) breadcrumbs

Modified:
   trunk/mavenpom4labs/pom.xml
   trunk/mavenpom4labs/src/site/site_en.xml
   trunk/mavenpom4labs/src/site/site_fr.xml
   trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml
   trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml
   trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml
   trunk/mavenpom4redmine/pom.xml
   trunk/mavenpom4redmine/src/site/site_en.xml
   trunk/mavenpom4redmine/src/site/site_fr.xml
   trunk/src/site/site_en.xml
   trunk/src/site/site_fr.xml

Modified: trunk/mavenpom4labs/pom.xml
===================================================================

--- trunk/mavenpom4labs/pom.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4labs/pom.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -184,7 +184,7 @@
       <!--distributionManagement>
         <site>
           <id>${site.server}</id>
-          <url>${site.repository}</url>
+          <url>${our.site.repository}</url>
         </site>
       </distributionManagement-->
     </profile>

Modified: trunk/mavenpom4labs/src/site/site_en.xml
===================================================================
--- trunk/mavenpom4labs/src/site/site_en.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4labs/src/site/site_en.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -32,8 +32,7 @@
   <body>
 
     <breadcrumbs>
-      <item name="${project.name}"
-            href="http://maven-site.nuiton.org/mavenpom/mavenpom4labs/index.html"/>
+      <item name="${project.name}" href="${project.url}"/>
     </breadcrumbs>
 
     <!-- TC-20100117 : ne fonctionne pas sur une langue non principale -->

Modified: trunk/mavenpom4labs/src/site/site_fr.xml
===================================================================
--- trunk/mavenpom4labs/src/site/site_fr.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4labs/src/site/site_fr.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -32,8 +32,7 @@
   <body>
 
     <breadcrumbs>
-      <item name="${project.name}"
-            href="http://maven-site.nuiton.org/mavenpom/mavenpom4labs/index.html"/>
+      <item name="${project.name}" href="${project.url}"/>
     </breadcrumbs>
 
     <menu ref="parent"/>

Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml
===================================================================
--- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -113,9 +113,9 @@
       </activation>
       <properties>
         <!-- force to use correct site location -->
-        <site.repository>
+        <!--site.repository>
           ${our.site.repository}/mavenpom/mavenpom4redmine/mavenpom4redmineAndCentral
-        </site.repository>
+        </site.repository-->
       </properties>
     </profile>
 

Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml
===================================================================
--- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_en.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -34,14 +34,13 @@
   <body>
 
     <breadcrumbs>
-      <item name="${project.name}"
-            href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndCentral/index.html"/>
+      <item name="${project.name}" href="${project.url}"/>
     </breadcrumbs>
 
     <!-- TC-20100117 : ne fonctionne pas sur une langue non principale -->
     <!--<menu ref="parent"/>-->
     <menu name="Parent Projet">
-      <item name="Mavenpom" href="../../en/index.html"/>
+      <item name="Mavenpom4redmine" href="../../en/index.html"/>
     </menu>
 
     <menu name="Language">

Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml
===================================================================
--- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/src/site/site_fr.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -33,8 +33,7 @@
   <body>
 
     <breadcrumbs>
-      <item name="${project.name}"
-            href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/mavenpom4redmineAndCentral/index.html"/>
+      <item name="${project.name}" href="${project.url}"/>
     </breadcrumbs>
 
     <menu ref="parent"/>

Modified: trunk/mavenpom4redmine/pom.xml
===================================================================
--- trunk/mavenpom4redmine/pom.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/pom.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -23,7 +23,9 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   #L%
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -77,7 +79,7 @@
   <!--Any mailing lists for the project-->
   <!--on redmine platform (nuiton or chorem) we normalize it to 3 lists -->
   <!--commits, devel and users -->
-  <mailingLists>
+  <!--mailingLists>
     <mailingList>
       <name>${listId}-commits</name>
       <subscribe>
@@ -113,7 +115,7 @@
       <post>${listId}-users@list.${platform}</post>
       <archive>http://list.${platform}/pipermail/${listId}-users/</archive>
     </mailingList>
-  </mailingLists>
+  </mailingLists-->
 
   <!-- ************************************************************* -->
   <!-- *** Build Settings ****************************************** -->
@@ -134,8 +136,10 @@
     <redmine.url>http://${platform}</redmine.url>
     <redmine.projectId>${projectId}</redmine.projectId>
     <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath>
-    <redmine.collectedArtifacts>target/collect-artifacts.txt</redmine.collectedArtifacts>
-    <redmine.collectedAttachments>target/collect-attachments.txt</redmine.collectedAttachments>
+    <redmine.collectedArtifacts>target/collect-artifacts.txt
+    </redmine.collectedArtifacts>
+    <redmine.collectedAttachments>target/collect-attachments.txt
+    </redmine.collectedAttachments>
     <redmine.deploymentUrl>${repository.home.url}</redmine.deploymentUrl>
 
     <redmine.templateDirectory>
@@ -143,7 +147,7 @@
     </redmine.templateDirectory>
 
     <!-- extra files to include in release -->
-    <redmine.releaseFiles />
+    <redmine.releaseFiles/>
 
     <!-- use this for a lib extra files -->
     <redmine.libReleaseFiles>
@@ -268,7 +272,8 @@
                 </goals>
                 <phase>install</phase>
                 <configuration>
-                  <descriptionFile>${redmine.collectedArtifacts}</descriptionFile>
+                  <descriptionFile>${redmine.collectedArtifacts}
+                  </descriptionFile>
                   <includeAttached>true</includeAttached>
                   <includeSiteAttached>true</includeSiteAttached>
                 </configuration>
@@ -281,7 +286,8 @@
                 <phase>install</phase>
                 <configuration>
                   <extraFiles>${redmine.releaseFiles}</extraFiles>
-                  <descriptionFile>${redmine.collectedAttachments}</descriptionFile>
+                  <descriptionFile>${redmine.collectedAttachments}
+                  </descriptionFile>
                   <includeAttached>false</includeAttached>
                 </configuration>
               </execution>
@@ -382,9 +388,11 @@
                 <phase>validate</phase>
                 <!--inherited>false</inherited-->
                 <configuration>
-                  <filesFromProperties>${redmine.collectedAttachments}</filesFromProperties>
+                  <filesFromProperties>${redmine.collectedAttachments}
+                  </filesFromProperties>
 
-                  <urlDownload>${redmine.url}/projects/files/${projectId}</urlDownload>
+                  <urlDownload>${redmine.url}/projects/files/${projectId}
+                  </urlDownload>
                   <artifactsFile>${redmine.collectedArtifacts}</artifactsFile>
 
                 </configuration>
@@ -453,8 +461,12 @@
                   <!-- for a multi-module just run on root project -->
                   <runOnce>true</runOnce>
 
-                  <emailTitle>[ANN] - ${project.name} ${project.version} released</emailTitle>
-                  <emailContentFile>target/generated-sources/announcement/release-email-announcement.vm</emailContentFile>
+                  <emailTitle>[ANN] - ${project.name} ${project.version}
+                    released
+                  </emailTitle>
+                  <emailContentFile>
+                    target/generated-sources/announcement/release-email-announcement.vm
+                  </emailContentFile>
                   <mailSender>
                     <name>${platform} Release Notification</name>
                     <email>noreply@${platform}</email>
@@ -499,7 +511,9 @@
               <closeVersion>true</closeVersion>
 
               <!-- publish-news -->
-              <newsContentFile>target/generated-sources/announcement/release-news-announcement.vm</newsContentFile>
+              <newsContentFile>
+                target/generated-sources/announcement/release-news-announcement.vm
+              </newsContentFile>
               <newsSummary>${project.description}</newsSummary>
               <newsTitle>${project.name} ${project.version} released</newsTitle>
 
@@ -664,6 +678,13 @@
         <!-- force to use correct site location -->
         <!--<site.repository>${our.site.repository}/mavenpom/mavenpom4redmine</site.repository>-->
       </properties>
+
+      <!--distributionManagement>
+        <site>
+          <id>${site.server}</id>
+          <url>${site.repository}/${projectId}</url>
+        </site>
+      </distributionManagement-->
     </profile>
 
 

Modified: trunk/mavenpom4redmine/src/site/site_en.xml
===================================================================
--- trunk/mavenpom4redmine/src/site/site_en.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/src/site/site_en.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -33,10 +33,9 @@
 
   <body>
 
-    <!--breadcrumbs>
-        <item name="${project.name}"
-              href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/>
-    </breadcrumbs-->
+    <breadcrumbs>
+      <item name="${project.name}" href="${project.url}"/>
+    </breadcrumbs>
 
     <!-- TC-20100117 : ne fonctionne pas sur une langue non principale -->
     <!--<menu ref="parent"/>-->

Modified: trunk/mavenpom4redmine/src/site/site_fr.xml
===================================================================
--- trunk/mavenpom4redmine/src/site/site_fr.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/mavenpom4redmine/src/site/site_fr.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -32,10 +32,9 @@
 
   <body>
 
-    <!--breadcrumbs>
-      <item name="${project.name}"
-            href="http://maven-site.nuiton.org/mavenpom/mavenpom4redmine/index.html"/>
-    </breadcrumbs-->
+    <breadcrumbs>
+      <item name="${project.name}" href="${project.url}"/>
+    </breadcrumbs>
 
     <menu ref="parent"/>
 

Modified: trunk/src/site/site_en.xml
===================================================================
--- trunk/src/site/site_en.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/src/site/site_en.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -44,6 +44,10 @@
   </bannerRight>
 
   <body>
+
+    <breadcrumbs>
+      <item name="${project.name}" href="${project.url}"/>
+    </breadcrumbs>
     <links>
       <item name="Chorem" href="http://www.chorem.org"/>
       <item name="Nuiton" href="http://www.nuiton.org"/>

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2011-09-09 10:59:56 UTC (rev 1164)
+++ trunk/src/site/site_fr.xml	2011-09-09 14:25:40 UTC (rev 1165)
@@ -44,6 +44,11 @@
   </bannerRight>
 
   <body>
+
+    <breadcrumbs>
+      <item name="${project.name}" href="${project.url}"/>
+    </breadcrumbs>
+
     <links>
       <item name="Chorem" href="http://www.chorem.org"/>
       <item name="Nuiton" href="http://www.nuiton.org"/>

    

r1165 - in trunk: mavenpom4labs mavenpom4labs/src/site mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral mavenpom4redmine/mavenpom4redmineAndCentral/src/site mavenpom4redmine/src/site src/site

tchemit＠users.nuiton.org

tags

participants (1)