r2765 - in trunk: . jaxx-compiler/src/site jaxx-config/src/site jaxx-demo jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/site jaxx-demo/src/site/rst jaxx-maven-plugin/src/site jaxx-runtime/src/site jaxx-swing-action/src/site jaxx-validator/src/site jaxx-widgets/src/site src/site - Jaxx-commits

8 Jan 2014

Author: tchemit
Date: 2014-01-08 19:55:30 +0100 (Wed, 08 Jan 2014)
New Revision: 2765

Url: http://nuiton.org/projects/jaxx/repository/revisions/2765

Log:
fixes #2998: Updates mavenpom to 4.5

Modified:
   trunk/jaxx-compiler/src/site/site_fr.xml
   trunk/jaxx-config/src/site/site_fr.xml
   trunk/jaxx-demo/pom.xml
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx
   trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java
   trunk/jaxx-demo/src/site/rst/index.rst
   trunk/jaxx-demo/src/site/site_fr.xml
   trunk/jaxx-maven-plugin/src/site/site_fr.xml
   trunk/jaxx-runtime/src/site/site_fr.xml
   trunk/jaxx-swing-action/src/site/site_fr.xml
   trunk/jaxx-validator/src/site/site_fr.xml
   trunk/jaxx-widgets/src/site/site_fr.xml
   trunk/pom.xml
   trunk/src/site/site_fr.xml

Modified: trunk/jaxx-compiler/src/site/site_fr.xml
===================================================================

--- trunk/jaxx-compiler/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-compiler/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -66,7 +66,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/jaxx-config/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-config/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-config/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>

Modified: trunk/jaxx-demo/pom.xml
===================================================================
--- trunk/jaxx-demo/pom.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/pom.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -54,6 +54,8 @@
 
     <!-- Post Release configuration -->
     <skipPostRelease>false</skipPostRelease>
+
+    <webstartPluginVersion>1.0-beta-5-SNAPSHOT</webstartPluginVersion>
   </properties>
 
   <dependencies>
@@ -304,6 +306,7 @@
         </property>
       </activation>
       <build>
+        <defaultGoal>package</defaultGoal>
         <plugins>
           <!-- key store secrets availables -->
           <plugin>
@@ -336,7 +339,7 @@
                 <id>generate-jnlp</id>
                 <phase>package</phase>
                 <goals>
-                  <goal>jnlp-inline</goal>
+                  <goal>jnlp-single2</goal>
                 </goals>
               </execution>
             </executions>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.css	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,3 +1,26 @@
+/*
+ * #%L
+ * JAXX :: Demo
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
 
 #config {
   border: {new TitledBorder(_("jaxxdemo.numbereditor.configuration"))};

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemo.jaxx	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,3 +1,26 @@
+<!--
+  #%L
+  JAXX :: Demo
+  $Id$
+  $HeadURL$
+  %%
+  Copyright (C) 2008 - 2013 CodeLutin
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+  
+  You should have received a copy of the GNU General Lesser Public 
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  #L%
+  -->
 <jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
 
   <import>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoHandler.java	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,5 +1,29 @@
 package jaxx.demo.component.jaxx.editor;
 
+/*
+ * #%L
+ * JAXX :: Demo
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
 import jaxx.runtime.spi.UIHandler;
 import jaxx.runtime.swing.editor.gis.DmdCoordinate;
 import jaxx.runtime.swing.editor.gis.DmsCoordinate;

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/CoordinateDemoModel.java	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,5 +1,29 @@
 package jaxx.demo.component.jaxx.editor;
 
+/*
+ * #%L
+ * JAXX :: Demo
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
 import org.jdesktop.beans.AbstractSerializableBean;
 
 /**

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.css	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,23 +1,23 @@
 /*
  * #%L
  * JAXX :: Demo
- *
+ * *
  * $Id$
  * $HeadURL$
  * %%
  * Copyright (C) 2008 - 2010 CodeLutin
  * %%
  * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the
+ * it under the terms of the GNU Lesser 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 Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-3.0.html>.
  * #L%

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemo.jaxx	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,3 +1,26 @@
+<!--
+  #%L
+  JAXX :: Demo
+  $Id$
+  $HeadURL$
+  %%
+  Copyright (C) 2008 - 2013 CodeLutin
+  %%
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+  
+  You should have received a copy of the GNU General Lesser Public 
+  License along with this program.  If not, see
+  <http://www.gnu.org/licenses/lgpl-3.0.html>.
+  #L%
+  -->
 <jaxx.demo.DemoPanel layout='{new BorderLayout()}'>
 
   <import>

Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java
===================================================================
--- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/SimpleTimeEditorDemoHandler.java	2014-01-08 18:55:30 UTC (rev 2765)
@@ -1,5 +1,29 @@
 package jaxx.demo.component.jaxx.editor;
 
+/*
+ * #%L
+ * JAXX :: Demo
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2008 - 2013 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-3.0.html>.
+ * #L%
+ */
+
 import jaxx.runtime.spi.UIHandler;
 
 /**

Modified: trunk/jaxx-demo/src/site/rst/index.rst
===================================================================
--- trunk/jaxx-demo/src/site/rst/index.rst	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/site/rst/index.rst	2014-01-08 18:55:30 UTC (rev 2765)
@@ -56,7 +56,7 @@
 
 .. _Java Web Start: http://java.sun.com/products/javawebstart/
 
-.. |webstart| image:: http://maven-site.nuiton.org/public/images/logos//webstart.gif
+.. |webstart| image:: ${mavenpomSiteCommonResourcesUrl}/images/logos/webstart.gif
 
 .. _following link: ./jnlp/launch.jnlp
 

Modified: trunk/jaxx-demo/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-demo/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-demo/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -27,24 +27,24 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
   <poweredBy>
     <logo href="http://maven-site.nuiton.org/jaxx/" name="Jaxx"
-          img="http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png"/>
   </poweredBy>
 
   <body>
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -73,7 +73,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-maven-plugin/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-maven-plugin/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -74,7 +74,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/jaxx-runtime/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-runtime/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-runtime/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -68,7 +68,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
   </body>

Modified: trunk/jaxx-swing-action/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-swing-action/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-swing-action/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -78,7 +78,7 @@
         <footer>
 
           <script type="text/javascript"
-                  src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+                  src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
           </script>
 
           <div id='projectMetas'
@@ -90,7 +90,8 @@
                scmwebeditorurl='${project.scmwebeditorUrl}'
                siteSourcesType='${project.siteSourcesType}'
                piwikEnabled='${project.piwikEnabled}'
-               piwikId='${project.piwikId}'>
+               piwikId='${project.piwikId}'
+               scmwebeditor_skipDefaultFiles="true">
           </div>
         </footer>
 

Modified: trunk/jaxx-validator/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-validator/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-validator/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -66,7 +66,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/jaxx-widgets/src/site/site_fr.xml
===================================================================
--- trunk/jaxx-widgets/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/jaxx-widgets/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -28,7 +28,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.chorem.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -36,11 +36,11 @@
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <breadcrumbs>
@@ -66,7 +66,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>
 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/pom.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>4.3</version>
+    <version>4.5</version>
   </parent>
 
   <artifactId>jaxx</artifactId>

Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml	2013-11-28 17:33:52 UTC (rev 2764)
+++ trunk/src/site/site_fr.xml	2014-01-08 18:55:30 UTC (rev 2765)
@@ -29,7 +29,7 @@
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.3.0</version>
+    <version>${fluidoSkinVersion}</version>
   </skin>
 
   <custom>
@@ -44,7 +44,7 @@
 
   <bannerLeft>
     <name>${project.name}</name>
-    <src>http://maven-site.nuiton.org/public/images/logos/jaxx-logo.png</src>
+    <src>${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png</src>
     <href>index.html</href>
   </bannerLeft>
 
@@ -58,23 +58,23 @@
 
   <poweredBy>
     <logo href="http://maven.apache.org" name="Maven"
-          img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/>
     <logo href="http://maven-site.nuiton.org/jrst" name="JRst"
-          img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/>
     <logo href="http://docutils.sourceforge.net/rst.html"
           name="ReStructuredText"
-          img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/>
+          img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/>
   </poweredBy>
 
   <body>
 
     <head>
       <script type="text/javascript"
-              src="http://maven-site.nuiton.org/public/js/mavenpom-site.js">
+              src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js">
       </script>
 
       <link rel="stylesheet" type="text/css"
-            href="http://maven-site.nuiton.org/public/css/mavenpom-site.css"/>
+            href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/>
     </head>
 
     <links>
@@ -144,7 +144,8 @@
            scmwebeditorurl='${project.scmwebeditorUrl}'
            siteSourcesType='${project.siteSourcesType}'
            piwikEnabled='${project.piwikEnabled}'
-           piwikId='${project.piwikId}'>
+           piwikId='${project.piwikId}'
+           scmwebeditor_skipDefaultFiles="true">
       </div>
     </footer>

    

tchemit＠users.nuiton.org

tags

participants (1)