From bpoussin@users.nuiton.org Fri Jan  4 16:51:26 2013
From: bpoussin@users.nuiton.org
To: nuiton-utils-commits@list.nuiton.org
Subject: [Nuiton-utils-commits] r2459 - in trunk/nuiton-utils/src:
	main/java/org/nuiton/util test/resources/properties
Date: Fri, 04 Jan 2013 16:51:26 +0100
Message-ID: <20130104155126.18643950D9@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4634279073125606176=="

--===============4634279073125606176==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bpoussin
Date: 2013-01-04 16:51:26 +0100 (Fri, 04 Jan 2013)
New Revision: 2459

Url: http://nuiton.org/projects/nuiton-utils/repository/revisions/2459

Log:
mise a jour de la doc pour les Os et arch
modif properties de test pour tester sans arch


Modified:
   trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java
   trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetwork=
Test.properties
   trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterTest.pr=
operties

Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java	=
2013-01-04 15:14:41 UTC (rev 2458)
+++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationUpdater.java	=
2013-01-04 15:51:26 UTC (rev 2459)
@@ -73,6 +73,22 @@
  * donc si le repertoire racine n'existe pas ou qu'il y a plusieurs repertoi=
res
  * a la racine le resultat de l'operation n'est pas celui souhaite
  *
+ * <h3>os.name and os.arch</h3>
+ * <table>
+ * <th><td>os.name</td><td>os.arch</td></th>
+ * <tr><td>linux</td><td>amd64</td></tr>
+ * <tr><td>linux</td><td>i386</td></tr>
+ * <tr><td>mac</td><td>ppc</td></tr>
+ * <tr><td>windows</td><td>x86</td></tr>
+ * <tr><td>solaris</td><td>sparc</td></tr>
+ * </table>
+ *
+ * os.name est tronque apres le 1er mot donc "windows 2000" et "windows 2003"
+ * deviennet tous les deux "windows". Si vous souhaitez g=C3=A9rer plus fine=
ment vos
+ * url de telechargement vous pouvez modifier les donnees via
+ * {@link ApplicationUpdaterCallback#updateToDo(java.util.Map) } en modifiant
+ * l'url avant de retourner la map
+ *
  * @author poussin
  * @version $Revision$
  *
@@ -373,6 +389,8 @@
         protected ApplicationConfig getUpdaterConfig(Proxy proxy) throws Exc=
eption {
             String osName =3D StringUtils.lowerCase(config.getOsName());
             String osArch =3D StringUtils.lowerCase(config.getOsArch());
+            // take only first part for osName (windows 2000 or windows 2003=
 -> windows)
+            osName =3D StringUtils.substringBefore(osName, " ");
=20
             if (log.isDebugEnabled()) {
                 log.debug(String.format(

Modified: trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdater=
NetworkTest.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetwor=
kTest.properties	2013-01-04 15:14:41 UTC (rev 2458)
+++ trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterNetwor=
kTest.properties	2013-01-04 15:51:26 UTC (rev 2459)
@@ -1,6 +1,6 @@
 App1.version=3D0.3
 App1.url=3Dhttp://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-utils/src/tes=
t/resources/ApplicationUpdater/zip/App1-0.3.zip
+linux.App3.version=3D8
+linux.App3.url=3Dhttp://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-utils/s=
rc/test/resources/ApplicationUpdater/zip/App3-7.zip
 linux.amd64.App2.version=3D7
 linux.amd64.App2.url=3Dhttp://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-u=
tils/src/test/resources/ApplicationUpdater/zip/App2-7.zip
-linux.x86.App3.version=3D7
-linux.x86.App3.url=3Dhttp://svn.nuiton.org/svn/nuiton-utils/trunk/nuiton-uti=
ls/src/test/resources/ApplicationUpdater/zip/App3-7.zip

Modified: trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdater=
Test.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterTest.p=
roperties	2013-01-04 15:14:41 UTC (rev 2458)
+++ trunk/nuiton-utils/src/test/resources/properties/ApplicationUpdaterTest.p=
roperties	2013-01-04 15:51:26 UTC (rev 2459)
@@ -1,6 +1,6 @@
 App1.version=3D0.3
 App1.url=3Dfile:src/test/resources/ApplicationUpdater/zip/App1-0.3.zip
+linux.App3.version=3D8
+linux.App3.url=3Dfile:src/test/resources/ApplicationUpdater/zip/App3-7.zip
 linux.amd64.App2.version=3D7
 linux.amd64.App2.url=3Dfile:src/test/resources/ApplicationUpdater/zip/App2-7=
.zip
-linux.x86.App3.version=3D7
-linux.x86.App3.url=3Dfile:src/test/resources/ApplicationUpdater/zip/App3-7.z=
ip


--===============4634279073125606176==--