[Fudaa-svn-commit] SF.net SVN: fudaa:[4353] branches/Prepro-0.92-SNAPSHOT

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4353
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4353&view=rev
Author:   deniger
Date:     2009-01-14 01:46:16 +0000 (Wed, 14 Jan 2009)

Log Message:
-----------


Modified Paths:
--------------
    branches/Prepro-0.92-SNAPSHOT/ant-properties.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/build.xml

Added Paths:
-----------
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.PNG
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.ico
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.jpg
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/commun/standalone-compiler.jar
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.properties
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/Licence.txt
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/standalone-compiler.jar
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.JPG
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.PNG
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.bat
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/oscar.ico
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/Licence.txt
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/izpack_fudaa_sinavi3.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/standalone-compiler.jar
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.PNG
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.bat
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.ico
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.jpg

Removed Paths:
-------------
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.properties
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/izpack_fudaa_oscar.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/oscar/izpack/standalone-compiler.jar
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/Licence.txt
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/build.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/Unix_shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/izpack_fudaa_sinavi3.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/shortcutSpec.xml
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/izpack/standalone-compiler.jar
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.PNG
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.bat
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.ico
    branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/sinavi3/sinavi3.jpg

Modified: branches/Prepro-0.92-SNAPSHOT/ant-properties.xml
===================================================================

--- branches/Prepro-0.92-SNAPSHOT/ant-properties.xml	2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/ant-properties.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 ! @creation     2006-02-02
-! @modification $Date: 2006-09-28 10:03:45 $
+! @modification $Date: 2008-01-17 11:36:59 $
 ! @license      GNU General Public License 2
 ! @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version      $Id: ant-properties.xml,v 1.8 2006-09-28 10:03:45 deniger Exp $
+! @version      $Id: ant-properties.xml,v 1.8.8.1 2008-01-17 11:36:59 bmarchan Exp $
 ! @author       Fred deniger
 !
 ! Ce fichier ant n'est pas \xE0 utiliser tel quel. Il faut utiliser le build de
@@ -88,9 +88,9 @@
     <property name="build.compiler.deprecation" value="off" />
     <property name="build.compiler.failonerror" value="false" />
 
-    <property name="java.maxmemory" value="128M" />
+    <property name="java.maxmemory" value="1024M" />
     <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/" />
-    <property name="javadoc.maxmemory" value="128M" />
+    <property name="javadoc.maxmemory" value="1024M" />
     <property name="javadoc.version" value="true" />
     <property name="javadoc.use" value="true" />
     <property name="javadoc.author" value="true" />

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.PNG (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.PNG)
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.bat)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.bat	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,6 @@
+echo off
+cls
+echo Execution de Fudaa-Albe en cours...
+java.exe -Xmx256m -DFUDAA_SERVEUR=serveurs\albe -jar fudaa-albe.jar
+cls
+echo Fin d'execution de Fudaa-Albe
\ No newline at end of file

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.ico (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.ico)
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/albe.jpg (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/albe.jpg)
===================================================================
(Binary files differ)

Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml	2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/build.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-15"?>
 <!--
 ! @creation     2006-9-28
-! @modification $Date: 2007-10-29 15:06:12 $
+! @modification $Date: 2008-11-28 12:00:00 $
 ! @license      GNU General Public License 2
 ! @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version      $Id: build.xml,v 1.1 2007-10-29 15:06:12 clavreul Exp $
+! @version      $Id: build.xml,v 1.2 2008-11-28 12:00:00 fargeix Exp $
 ! @author       Nicolas Clavreul
 !
 ! build permettant de construire le jar
 -->
 <project name="albe" default="deploy" basedir=".">
   <import file="../ant-deploy.xml" />
+  <taskdef name="izpack" classpath="../commun/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
   <property name="this.main.class" value="Albe" />
 
   <!--
@@ -87,4 +88,9 @@
     </genjar>
   </target>
 	-->
+	
+	<taskdef resource="genjar.properties"/>
+	<target name="createInstaller" description="cree l'installeur Albe">
+		<izpack input="izpack/izpack_fudaa_albe.xml" output="../../../distrib/build/jar/albe/Fudaa_Albe_Install.jar" basedir="." />
+	</target>
 </project>

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<shortcuts>
-	<programGroup defaultName="Fudaa Albe" location="applications"/>
-	<shortcut
-        name="Lancer Albe"
-        programGroup="yes"
-        desktop="yes"
-        applications="no"
-        startMenu="no"
-        startup="no"
-        target="$JAVA_HOME/bin/java"
-        commandLine="-DINSTALLDIR=$INSTALL_PATH -DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/albe -cp $INSTALL_PATH/fudaa-albe.jar org.fudaa.fudaa.albe.Albe"
-		workingDirectory="$INSTALL_PATH"
-		type="Application"
-		iconFile="$INSTALL_PATH/albe.png"
-		initialState="noShow"
-        description="Lance le logiciel Albe">
-		<createForPack name="Albe"/>
-	</shortcut>
-	
-	<shortcut
-            name="Supprimer Albe"
-            programGroup="yes"
-            desktop="yes"
-            applications="no"
-            startMenu="no"
-            startup="no"
-            target="$JAVA_HOME/bin/java"
-            commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
-            initialState="noShow"
-			iconFile="trashcan_full"
-			iconIndex="0"
-			workingDirectory=""
-			type="Application"
-			encoding="UTF-8"
-            description="Supprime le logiciel Albe">
-        <createForPack name="Albe"/>
-    </shortcut>
-	
-</shortcuts>
\ No newline at end of file

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/Unix_shortcutSpec.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<shortcuts>
+	<programGroup defaultName="Fudaa Albe" location="applications"/>
+	<shortcut
+        name="Lancer Albe"
+        programGroup="yes"
+        desktop="yes"
+        applications="no"
+        startMenu="no"
+        startup="no"
+        target="$JAVA_HOME/bin/java"
+        commandLine="-DINSTALLDIR=$INSTALL_PATH -DFUDAA_SERVEUR=$INSTALL_PATH/serveurs/albe -cp $INSTALL_PATH/fudaa-albe.jar org.fudaa.fudaa.albe.Albe"
+		workingDirectory="$INSTALL_PATH"
+		type="Application"
+		iconFile="$INSTALL_PATH/albe.png"
+		initialState="noShow"
+        description="Lance le logiciel Albe">
+		<createForPack name="Albe"/>
+	</shortcut>
+	
+	<shortcut
+            name="Supprimer Albe"
+            programGroup="yes"
+            desktop="yes"
+            applications="no"
+            startMenu="no"
+            startup="no"
+            target="$JAVA_HOME/bin/java"
+            commandLine="-jar &quot;$INSTALL_PATH/Uninstaller/uninstaller.jar&quot;"
+            initialState="noShow"
+			iconFile="trashcan_full"
+			iconIndex="0"
+			workingDirectory=""
+			type="Application"
+			encoding="UTF-8"
+            description="Supprime le logiciel Albe">
+        <createForPack name="Albe"/>
+    </shortcut>
+	
+</shortcuts>
\ No newline at end of file

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-
-<!-- 
-    A sample installation file.
-    Use it as a base for your own installers :-)
-    
-    To compile it :
-    - go in the bin directory where you installed IzPack
-    - call "compile ../sample/install.xml -b ../sample"
--->
-
-<installation version="1.0">
-
-    <!-- 
-        The info section.
-        The meaning of the tags should be natural ...
-    -->
-    <info>
-        <appname>Albe</appname>
-        <appversion>1.1.1</appversion>
-        <authors>
-            <author name="Sabrina DELATTRE" email="de...@fu..."/>
-        </authors>
-        <url>http://www.cetmef.developpement-durable.gouv.fr/</url>
-    </info>
-
-    <!-- 
-        The gui preferences indication.
-        Sets the installer window to 640x480. It will not be able to change the size.
-    -->
-    <guiprefs width="800" height="520" resizable="no"/>
-
-	<variables>
-		<variable name="$DesktopShortcutCheckboxEnabled" value="true"/>
-	</variables>
-	
-    <!-- 
-        The locale section.
-        Asks here to include the English and French langpacks.
-    -->
-    <locale>
-        <langpack iso3="fra"/>
-    </locale>
-
-    <!-- 
-        The resources section.
-        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-    -->
-    <resources>
-        <res id="LicencePanel.licence" src="../commun/licence.txt"/>
-		<res id="shortcutSpec.xml" src="izpack/shortcutSpec.xml"/>
-		<res id="Unix_shortcutSpec.xml" src="izpack/Unix_shortcutSpec.xml"/>
-		<res src="albe.jpg" id="Installer.image.0"/>
-	</resources>
-	
-    <!-- 
-        The panels section.
-        We indicate here which panels we want to use. The order will be respected.
-    -->
-    <panels>
-        <panel classname="HelloPanel" id="hellopanel"/>
-        <panel classname="LicencePanel" id="licensepanel"/>
-        <panel classname="TargetPanel" id="targetpanel"/>
-        <panel classname="PacksPanel" id="packspanel"/>
-        <panel classname="InstallPanel" id="installpanel"/>
-		<panel classname="ShortcutPanel" id="shortcutpanel"/>
-        <panel classname="FinishPanel" id="finishpanel"/>
-    </panels>
-
-    <!-- 
-        The packs section.
-        We specify here our packs.
-    -->
-
-	<packs>
-        <pack name="Albe" required="yes">
-            <description>Installe tous les composants du logiciel Albe</description>
-            <file src="../commun/licence.txt" targetdir="$INSTALL_PATH"/>
-            <file src="albe.bat" targetdir="$INSTALL_PATH"/>
-			<file src="albe.ico" targetdir="$INSTALL_PATH"/>
-			<file src="albe.png" targetdir="$INSTALL_PATH"/>
-			<file src="../../../distrib/build/jar/albe/fudaa-albe.jar" targetdir="$INSTALL_PATH"/>
-			<file src="../../aide/src/albe" targetdir="$INSTALL_PATH/aide"/>
-			<file src="../../fudaa/serveurs/albe" targetdir="$INSTALL_PATH/serveurs"/>
-			<executable targetfile="$INSTALL_PATH/serveurs/albe/bin/linux/albe_linux.x" stage="never"/>
-        </pack>
-    </packs>
-	
-	<native type="izpack" name="ShellLink.dll"/>
-
-</installation>

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/izpack_fudaa_albe.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+
+<!-- 
+    A sample installation file.
+    Use it as a base for your own installers :-)
+    
+    To compile it :
+    - go in the bin directory where you installed IzPack
+    - call "compile ../sample/install.xml -b ../sample"
+-->
+
+<installation version="1.0">
+
+    <!-- 
+        The info section.
+        The meaning of the tags should be natural ...
+    -->
+    <info>
+        <appname>Albe</appname>
+        <appversion>1.1.1</appversion>
+        <authors>
+            <author name="Sabrina DELATTRE" email="de...@fu..."/>
+        </authors>
+        <url>http://www.cetmef.developpement-durable.gouv.fr/</url>
+    </info>
+
+    <!-- 
+        The gui preferences indication.
+        Sets the installer window to 640x480. It will not be able to change the size.
+    -->
+    <guiprefs width="800" height="520" resizable="no"/>
+
+	<variables>
+		<variable name="$DesktopShortcutCheckboxEnabled" value="true"/>
+	</variables>
+	
+    <!-- 
+        The locale section.
+        Asks here to include the English and French langpacks.
+    -->
+    <locale>
+        <langpack iso3="fra"/>
+    </locale>
+
+    <!-- 
+        The resources section.
+        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+    -->
+    <resources>
+        <res id="LicencePanel.licence" src="../commun/licence.txt"/>
+		<res id="shortcutSpec.xml" src="izpack/shortcutSpec.xml"/>
+		<res id="Unix_shortcutSpec.xml" src="izpack/Unix_shortcutSpec.xml"/>
+		<res src="albe.jpg" id="Installer.image.0"/>
+	</resources>
+	
+    <!-- 
+        The panels section.
+        We indicate here which panels we want to use. The order will be respected.
+    -->
+    <panels>
+        <panel classname="HelloPanel" id="hellopanel"/>
+        <panel classname="LicencePanel" id="licensepanel"/>
+        <panel classname="TargetPanel" id="targetpanel"/>
+        <panel classname="PacksPanel" id="packspanel"/>
+        <panel classname="InstallPanel" id="installpanel"/>
+		<panel classname="ShortcutPanel" id="shortcutpanel"/>
+        <panel classname="FinishPanel" id="finishpanel"/>
+    </panels>
+
+    <!-- 
+        The packs section.
+        We specify here our packs.
+    -->
+
+	<packs>
+        <pack name="Albe" required="yes">
+            <description>Installe tous les composants du logiciel Albe</description>
+            <file src="../commun/licence.txt" targetdir="$INSTALL_PATH"/>
+            <file src="albe.bat" targetdir="$INSTALL_PATH"/>
+			<file src="albe.ico" targetdir="$INSTALL_PATH"/>
+			<file src="albe.png" targetdir="$INSTALL_PATH"/>
+			<file src="../../../distrib/build/jar/albe/fudaa-albe.jar" targetdir="$INSTALL_PATH"/>
+			<file src="../../aide/src/albe" targetdir="$INSTALL_PATH/aide"/>
+			<file src="../../fudaa/serveurs/albe" targetdir="$INSTALL_PATH/serveurs"/>
+			<executable targetfile="$INSTALL_PATH/serveurs/albe/bin/linux/albe_linux.x" stage="never"/>
+        </pack>
+    </packs>
+	
+	<native type="izpack" name="ShellLink.dll"/>
+
+</installation>

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/albe/izpack/shortcutSpec.xml	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,36 +0,0 @@
-<shortcuts>
-	<skipIfNotSupported/>
-	<programGroup defaultName="Applications Fudaa\Albe" location="applications"/>
-	<shortcut
-        name="Lancer Albe"
-        programGroup="yes"
-        desktop="yes"
-        applications="no"
-        startMenu="no"
-        startup="no"
-        target="$INSTALL_PATH\albe.bat"
-        commandLine=""
-		workingDirectory="$INSTALL_PATH"
-		iconFile="$INSTALL_PATH\albe.ico"
-		initialState="noShow"
-        description="Lance le logiciel Albe">
-		<createForPack name="Albe"/>
-	</shortcut>
-	
-	<shortcut
-            name="Supprimer Albe"
-            programGroup="yes"
-            desktop="no"
-            applications="no"
-            startMenu="no"
-            startup="no"
-            target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
-            commandLine=""
-            iconFile="%SystemRoot%\system32\SHELL32.dll"
-            iconIndex="31"
-            description="Supprime le logiciel Albe">
-
-        <createForPack name="Albe"/>
-    </shortcut>
-	
-</shortcuts>

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/albe/izpack/shortcutSpec.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/albe/izpack/shortcutSpec.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,36 @@
+<shortcuts>
+	<skipIfNotSupported/>
+	<programGroup defaultName="Applications Fudaa\Albe" location="applications"/>
+	<shortcut
+        name="Lancer Albe"
+        programGroup="yes"
+        desktop="yes"
+        applications="no"
+        startMenu="no"
+        startup="no"
+        target="$INSTALL_PATH\albe.bat"
+        commandLine=""
+		workingDirectory="$INSTALL_PATH"
+		iconFile="$INSTALL_PATH\albe.ico"
+		initialState="noShow"
+        description="Lance le logiciel Albe">
+		<createForPack name="Albe"/>
+	</shortcut>
+	
+	<shortcut
+            name="Supprimer Albe"
+            programGroup="yes"
+            desktop="no"
+            applications="no"
+            startMenu="no"
+            startup="no"
+            target="$INSTALL_PATH\Uninstaller\uninstaller.jar"
+            commandLine=""
+            iconFile="%SystemRoot%\system32\SHELL32.dll"
+            iconIndex="31"
+            description="Supprime le logiciel Albe">
+
+        <createForPack name="Albe"/>
+    </shortcut>
+	
+</shortcuts>

Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml	2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/build.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -49,7 +49,7 @@
     <mkdir dir="${fudaa.dist.classes.test.dir}" />
     <echo message="debug=${build.compiler.debug}" />
     <echo message="optimize=${build.compiler.optimize}" />
-    <echo message="Vous devez utiliser java 1.4" />
+    <echo message="Vous devez utiliser java 1.5" />
     <echo message="version utilisee: ${ant.java.version}" />
     <ant dir="${ctulu.dir}" antfile="${ctulu.build.file}" target="build" inheritAll="false">
       <property name="build.compiler" value="${build.compiler}" />

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/commun/standalone-compiler.jar (from rev 4350, trunk/fudaa_devel/fudaa-distrib/commun/standalone-compiler.jar)
===================================================================
(Binary files differ)

Modified: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml	2009-01-14 01:43:21 UTC (rev 4352)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/mascaret/izpack/izpack_fudaa_mascaret.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,110 +1,111 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<!--  
-    A sample installation file.
-    Use it as a base for your own installers :-)
-    
-    To compile it :
-    - go in the bin directory where you installed IzPack
-    - call "compile ../sample/install.xml -b ../sample"
-
-  -->
-<installation version="1.0">
- <!--  
-        The info section.
-        The meaning of the tags should be natural ...
-    
-  --> 
-<info>
-		<appname>Fudaa-Mascaret</appname>
-		<appversion>3.1 alpha 1</appversion>
-		<variable name="released-on" value="13/12/2007" />
-		<authors>
-			<author name="EDF Recherche et Développement" email="" />
-			<author name="CETMEF" email="" />
-		</authors>
-		<url>http://rd.edf.com</url>
-	</info>
-<native type="izpack" name="ShellLink.dll" /> 
- <!--  
-        The gui preferences indication.
-        Sets the installer window to 800x420. It will be able to change the size.
-    
-  --> 
-  <guiprefs width="800" height="420" resizable="yes" /> 
- <!--  
-        The locale section.
-        Asks here to include the French langpacks.
-    
-  --> 
- <locale>
-		<langpack iso3="fra" />
-	</locale>
- <!--  
-        The resources section.
-        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
-    
-  --> 
- <resources>
-        <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
-		<res src="Licence.txt"             id="LicencePanel.licence"/>
-		<res src="Readme.txt"              id="InfoPanel.info"  />
-		<res src="fudaamascaret.jpg"       id="Installer.image"/>
-		<!--  res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/  -->
-	</resources>
-
- <!--  
-        The panels section.
-        We indicate here which panels we want to use. The order will be respected.
-    
-  --> 
- <panels>
-		<panel classname="HelloPanel" />
-		<panel classname="InfoPanel" />
-		<panel classname="LicencePanel" />
-		<panel classname="TargetPanel" />
-		<panel classname="PacksPanel" />
-		<panel classname="InstallPanel" />
-		<panel classname="ShortcutPanel" />
-		<panel classname="FinishPanel" />
-	</panels>
- <!--  
-        The packs section.
-        We specify here our packs.
-  --> 
- <packs>
-		<pack name="Core" required="yes">
-			<description>L'application de base intégrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
-			<file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
-			<file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
-			<file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
-			<file src="icons" targetdir="$INSTALL_PATH" />
-			<parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
-		</pack>
-		<pack name="Exemples" required="no">
-			<description>Quelques exemples de fichiers d'entrée de Fudaa-Mascaret</description>
-			<file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
-		</pack>
-		<pack name="Docs" required="no">
-			<description>Le guide de prise en main de Fudaa-Mascaret</description>
-			<file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
-		</pack>
-		<pack name="Sources" required="no">
-			<description>Le code source du projet Fudaa</description>
-			<fileset dir="../.." targetdir="$INSTALL_PATH/src">
-				<include name="ctulu/src/**/*.*" />
-				<include name="dodico/idl/**/*.*" />
-				<include name="dodico/src/**/*.*" />
-				<include name="ebli/src/**/*.*" />
-				<include name="fudaa/src/**/*.*" />
-			</fileset>
-		</pack>
-	</packs>
-
-     <!-- The native libraries to add -->
-     <native type="izpack" name="ShellLink.dll" />
-	 <native type="3rdparty" name="COIOSHelper.dll" stage="both">
-		<os family="windows"/>
-	 </native>
-
-     
- </installation>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!--  
+    A sample installation file.
+    Use it as a base for your own installers :-)
+    
+    To compile it :
+    - go in the bin directory where you installed IzPack
+    - call "compile ../sample/install.xml -b ../sample"
+
+  -->
+<installation version="1.0">
+ <!--  
+        The info section.
+        The meaning of the tags should be natural ...
+    
+  --> 
+<info>
+		<appname>Fudaa-Mascaret</appname>
+		<appversion>3.1 alpha 1</appversion>
+		<variable name="released-on" value="13/12/2007" />
+		<authors>
+			<author name="EDF Recherche et Développement" email="" />
+			<author name="CETMEF" email="" />
+		</authors>
+		<url>http://rd.edf.com</url>
+	</info>
+<native type="izpack" name="ShellLink.dll" /> 
+ <!--  
+        The gui preferences indication.
+        Sets the installer window to 800x420. It will be able to change the size.
+    
+  --> 
+  <guiprefs width="800" height="420" resizable="yes" /> 
+ <!--  
+        The locale section.
+        Asks here to include the French langpacks.
+    
+  --> 
+ <locale>
+		<langpack iso3="fra" />
+	</locale>
+ <!--  
+        The resources section.
+        The ids must be these ones if you want to use the LicencePanel and/or the InfoPanel.
+    
+  --> 
+ <resources>
+        <res src="izpack/shortcutSpec.xml" id="shortcutSpec.xml" />
+		<res src="Licence.txt"             id="LicencePanel.licence"/>
+		<res src="Readme.txt"              id="InfoPanel.info"  />
+		<res src="fudaamascaret.jpg"       id="Installer.image"/>
+		<!--  res src="izpack/RegistrySpec.xml" id="RegistrySpec.xml"/  -->
+	</resources>
+
+ <!--  
+        The panels section.
+        We indicate here which panels we want to use. The order will be respected.
+    
+  --> 
+ <panels>
+		<panel classname="HelloPanel" />
+		<panel classname="InfoPanel" />
+		<panel classname="LicencePanel" />
+		<panel classname="TargetPanel" />
+		<panel classname="PacksPanel" />
+		<panel classname="InstallPanel" />
+		<panel classname="ShortcutPanel" />
+		<panel classname="FinishPanel" />
+	</panels>
+ <!--  
+        The packs section.
+        We specify here our packs.
+  --> 
+ <packs>
+		<pack name="Core" required="yes">
+			<description>L'application de base intégrant l'interface graphique Fudaa-Mascaret et le code de calcul Mascaret</description>
+			<file src="../../../distrib/build/jar/mascaret/fudaa-mascaret.jar" targetdir="$INSTALL_PATH" />
+			<file src="../../fudaa/serveurs" targetdir="$INSTALL_PATH" />
+			<file src="../../aide/src/mascaret" targetdir="$INSTALL_PATH/aide/src" />
+			<file src="fudaa-mascaret.bat" targetdir="$INSTALL_PATH" />
+			<file src="icons" targetdir="$INSTALL_PATH" />
+			<parsable targetfile="$INSTALL_PATH/fudaa-mascaret.bat" /> <!-- The file will be parsed -->
+		</pack>
+		<pack name="Exemples" required="no">
+			<description>Quelques exemples de fichiers d'entrée de Fudaa-Mascaret</description>
+			<file src="exemples" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+		</pack>
+		<pack name="Docs" required="no">
+			<description>Le guide de prise en main de Fudaa-Mascaret</description>
+			<file src="doc" targetdir="$INSTALL_PATH" /> <!-- Reccursive adding -->
+		</pack>
+		<pack name="Sources" required="no">
+			<description>Le code source du projet Fudaa</description>
+			<fileset dir="../.." targetdir="$INSTALL_PATH/src">
+				<include name="ctulu/src/**/*.*" />
+				<include name="dodico/idl/**/*.*" />
+				<include name="dodico/src/**/*.*" />
+				<include name="ebli/src/**/*.*" />
+				<include name="fudaa/src/**/*.*" />
+			</fileset>
+		</pack>
+	</packs>
+
+     <!-- The native libraries to add -->
+     <native type="izpack" name="ShellLink.dll" />
+	 <native type="3rdparty" name="COIOSHelper.dll" stage="both">
+		<os family="windows"/>
+	 </native>
+
+     
+ </installation>

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/build.xml	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-! @file         distribution.xml
-! @creation     2002-04-05
-! @modification $Date: 2008-02-14 17:07:35 $
-! @license      GNU General Public License 2
-! @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
-! @version      $Id: build.xml,v 1.1.2.1 2008-02-14 17:07:35 bmarchan Exp $
-! @author       Fred deniger
-!
-! Voir les fichiers fudaa.default.properties et ANT_README.txt pour la liste
-! des taches et pour modifier des parametres.
-! Pour mettre \xE0 jour les sites distants, le fichier ant.properties doit \xEAtre correctement renseign\xE9.
-! Il se peut que eclipse d\xE9tecte une erreur dans ce script comme quoi la cible 'build' n'est pas trouv\xE9
-! mais il ne faut pas en tenir compte: elle est import\xE9e dans le fichier '../ant-deploy.xml'.
--->
-<project name="modeleur" default="deploy" basedir=".">
-
-  <!--on importe les taches du fichier ant-deploy.xml-->
-  <import file="../ant-deploy.xml" />
-
-  <property name="this.main.class" value="Mdl" />
-  <property name="this.dir" location="./" />
-  <property name="jnlp.file.name" value="mdl.jnlp" />
-  <property name="jnlp.file" location="${this.dir}/${jnlp.file.name}" />
-  <property name="prop.file" location="${this.dir}/mdl.properties" />
-  <property file="${prop.file}" />
-  <property name="ssh.install.dir" value="/home/fudaa/www/install" />
-  <property name="mdl.install.dir" value="${ssh.install.dir}/mdl" />
-
-  <!--Construit les 2 fichiers jnlp \xE0 utiliser: un avec la 3D et l'autre sans.
-  Le lien pour la 3D est r\xE9cup\xE9r\xE9 dans le fichier "java3D-link.txt"-->
-  <target name="buildJnlp" depends=".testChemins" description="Construit le contenu des fichiers jnlp">
-    <copy overwrite="true" file="${jnlp.file}" todir="${this.build.dir}" filtering="true">
-      <filterset>
-        <filter token="version" value="v${@version@}" />
-      </filterset>
-    </copy>
-  </target>
-
-  <target name="deployAndSend"
-          depends="deploy,sendToFudaaFr"
-          description="Construit les jars et met a jour les sites distants">
-  </target>
-
-
-  <!--          depends="rebuild"-->
-  <target name="deploy"
-  depends="  .testChemins"
-          description="efface les classes, recompile le tout,cree et signe le jar. 
-    Les fichiers Jnlp sont \xE9galament cr\xE9\xE9s">
-    <antcall target="createJar" />
-    <antcall target="signJar" />
-    <!--Le build Zip reconstruit deja les fichiers jnlp -->
-    <antcall target="buildJnlp" />
-  </target>
-
-  <!--Envoie Tout ce qui est necessaire sauf l'aide:car elle ne bouge pas beaucoup! -->
-  <target name="sendToFudaaFr"
-          depends="setProxy,.testChemins"
-          description="Met a jour les sites distants ( sauf le jar d'aide)">
-    <scp file="${this.build.dir}/${jnlp.file.name}"
-         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}"
-         trust="true" />
-    <scp todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/images" trust="true">
-      <fileset dir="${basedir}/images" excludes="*.xcf" />
-    </scp>
-
-    <!--Pour que le tout marche il faut que le jar et le jar.pack.gz soient dans un dossier inf\xE9rieur-->
-    <scp file="${this.jar.file}.pack.gz"
-         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
-         trust="true" />
-    <scp file="${this.jar.file}"
-         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
-         trust="true" />
-
-    <scp file="${basedir}/jars/fudaa-mdl.jar.var"
-         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
-         trust="true" />
-    <scp file="${basedir}/jars/.htaccess"
-         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
-         trust="true" />
-  </target>
-
-
-
-  <target name="createJar" depends=".testCheminGenJar" description="cree fudaa_modeleur.jar">
-    <!--On prepare le dossier de destination et on efface les anciens jars pour \xE9viter les conflits:
-  des fois la tache genjar essaie de mettre \xE0 jour le jar ce qui prend du temps et peut \xEAtre source d'erreur
-  subtile-->
-    <mkdir dir="${this.jar.dir}" />
-    <delete file="${this.jar.file}" />
-    <genjar jarfile="${this.jar.file}">
-      <classpath path="${fudaaDist.classpath}" />
-      <manifest generateEntryAttributes="no">
-        <attribute name="Main-Class" value="org.fudaa.fudaa.modeleur.Mdl" />
-      </manifest>
-      <class name="org.fudaa.fudaa.modeleur.Mdl" />
-      <!--Cette classe GrData est ajout\xE9e \xE0 cause d'un bogue avec db4o qui ne retrouvait pas ces petits-->
-      <class name="org.fudaa.ebli.geometrie.GrData" />
-      <!--Pour ces librairies, tous les fichiers et toutes les ressources sont n\xE9cessaires-->
-      <library jar="${ctulu.lib.dir}/db4o.jar" />
-      <library jar="${ctulu.lib.dir}/fgis.jar" />
-      <library jar="${ctulu.lib.dir}/looks.jar" />
-      <library jar="${ctulu.lib.dir}/jep.jar" />
-      <!--Pas de CORBA pour Fudaa-Modeleur-->
-      <classfilter>
-        <exclude name="org.fudaa.dodico.corba." />
-        <exclude name="org.fudaa.dodico.usine." />
-      </classfilter>
-      <!--Les ressources utilis\xE9es-->
-      <!--On utilise pas les icones de bu mais ceux de crystal, d'ou les excludes-->
-      <resource>
-        <fileset dir="${fudaa.dist.classes.dir}">
-          <patternset refid="ressources.fic" />
-          <include name="org/fudaa/dodico/commun/" />
-          <include name="org/fudaa/ctulu/" />
-          <include name="com/memoire/bu/" />
-          <include name="com/hexidec/ekit/" />
-          <include name="com/memoire/dja/" />
-          <exclude name="com/memoire/dja/*_24.*" />
-          <exclude name="com/memoire/dja/logo*.*" />
-          <exclude name="com/memoire/dja/banner*.*" />
-          <exclude name="com/memoire/bu/alma_*" />
-          <exclude name="com/memoire/bu/*_16.*" />
-          <exclude name="com/memoire/bu/*_20.*" />
-          <exclude name="com/memoire/bu/*_22.*" />
-          <exclude name="com/memoire/bu/*_24.*" />
-          <exclude name="com/memoire/bu/*_26.*" />
-          <exclude name="com/memoire/bu/*_32.*" />
-          <exclude name="com/memoire/bu/*_48.*" />
-          <exclude name="com/memoire/bu/*_64.*" />
-          <exclude name="com/memoire/bu/crystal22_*" />
-          <include name="com/memoire/dnd/" />
-          <include name="com/memoire/bu/crystal*" />
-          <include name="org/fudaa/dodico/h2d/" />
-          <include name="org/fudaa/dodico/reflux/" />
-          <include name="org/fudaa/ebli/ressource/" />
-          <exclude name="org/fudaa/ebli/ressource/volume" />
-          <exclude name="org/fudaa/ebli/ressource/echellez*" />
-          <exclude name="org/fudaa/ebli/ressource/lumiere*" />
-          <exclude name="org/fudaa/ebli/ressource/texture*" />
-          <include name="org/fudaa/fudaa/ressource/" />
-          <exclude name="org/fudaa/fudaa/ressource/connecter*" />
-          <exclude name="org/fudaa/fudaa/ressource/astuces/" />
-          <include name="org/fudaa/fudaa/sig/" />
-          <include name="org/fudaa/fudaa/modeleur/" />
-          <include name="ghm/followgui/" />
-        </fileset>
-      </resource>
-    </genjar>
-    <!--Important car utilis\xE9 par geotools pour ces factories-->
-    <zip destfile="${this.jar.file}" update="true" compress="true">
-      <zipgroupfileset file="${ctulu.lib.dir}/fgis.jar"
-                       includes="META-INF/services/**,META-INF/registry*" />
-    </zip>
-  </target>
-
-
-  <!--Signe les jars cr\xE9es. Il faut utilise le sdk 1.5 pour cette tache a cause 
-  de l'exe pack-->
-  <target name="signJar" depends=".testChemins">
-    <property name="jarsigner" location="${java.home}/../bin/jarsigner">
-    </property>
-    <property file="${cert.dir}/fudaa-jar.txt" />
-    <signjar jar="${this.jar.file}"
-             alias="${fudaa.alias}"
-             storepass="${fudaa.password}"
-             keystore="${cert.dir}/fudaa.keystore" />
-    <echo>RePack200 ${this.jar.name}</echo>
-    <exec newenvironment="true"
-          dir="${this.jar.dir}"
-          executable="${java.home}/bin/pack200"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="--repack ${this.jar.name}" />
-    </exec>
-    <echo>RePack200 ${this.jar.name} END</echo>
-    <signjar jar="${this.jar.file}"
-             alias="${fudaa.alias}"
-             storepass="${fudaa.password}"
-             keystore="${cert.dir}/fudaa.keystore" />
-    <!--Je ne sais pas pourquoi il faut le faire 2 fois
-    il semble qu'il y ait un bug dans les exe java
-    -->
-    <!--A retester avec les nouvelles versions de Java-->
-    <echo>RePack200 ${this.jar.name} ENCORE ...</echo>
-    <exec newenvironment="true"
-          dir="${this.jar.dir}"
-          executable="${java.home}/bin/pack200"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="--repack ${this.jar.name}" />
-    </exec>
-    <echo>RePack200 ${this.jar.name} ENCORE END</echo>
-    <signjar jar="${this.jar.file}"
-             alias="${fudaa.alias}"
-             storepass="${fudaa.password}"
-             keystore="${cert.dir}/fudaa.keystore" />
-    <echo>Test ${this.jar.name}</echo>
-    <exec dir="${this.jar.dir}"
-          executable="${jarsigner}"
-          newenvironment="true"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="-verify ${this.jar.name}" />
-    </exec>
-    <echo>Test ${this.jar.name} END</echo>
-    <delete file="${this.jar.dir}/${this.jar.name}.pack.gz" />
-    <echo>Pack200 ${this.jar.name}</echo>
-    <exec newenvironment="true"
-          dir="${this.jar.dir}"
-          executable="${java.home}/bin/pack200"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="${this.jar.name}.pack.gz ${this.jar.name}" />
-    </exec>
-    <echo>Pack200 ${this.jar.name} END</echo>
-    <!--On teste la signature pour \xE9viter de balancer n'importe quoi sur le site-->
-    <echo>Test ${this.jar.name}.pack.gz</echo>
-    <exec newenvironment="true"
-          dir="${this.jar.dir}"
-          executable="${java.home}/bin/unpack200"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="${this.jar.name}.pack.gz ${this.jar.name}.pack.gz.jar" />
-    </exec>
-    <exec dir="${this.jar.dir}"
-          executable="${jarsigner}"
-          newenvironment="true"
-          failonerror="true"
-          vmlauncher="false">
-      <arg line="-verify ${this.jar.name}.pack.gz.jar" />
-    </exec>
-    <delete file="${this.jar.dir}/${this.jar.name}.pack.gz.jar" />
-    <echo>Test ${this.jar.name}.pack.gz END</echo>
-  </target>
-
-</project>

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/build.xml)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/build.xml	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+! @file         distribution.xml
+! @creation     2002-04-05
+! @modification $Date: 2008-02-14 17:07:35 $
+! @license      GNU General Public License 2
+! @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+! @version      $Id: build.xml,v 1.1.2.1 2008-02-14 17:07:35 bmarchan Exp $
+! @author       Fred deniger
+!
+! Voir les fichiers fudaa.default.properties et ANT_README.txt pour la liste
+! des taches et pour modifier des parametres.
+! Pour mettre \xE0 jour les sites distants, le fichier ant.properties doit \xEAtre correctement renseign\xE9.
+! Il se peut que eclipse d\xE9tecte une erreur dans ce script comme quoi la cible 'build' n'est pas trouv\xE9
+! mais il ne faut pas en tenir compte: elle est import\xE9e dans le fichier '../ant-deploy.xml'.
+-->
+<project name="modeleur" default="deploy" basedir=".">
+
+  <!--on importe les taches du fichier ant-deploy.xml-->
+  <import file="../ant-deploy.xml" />
+
+  <property name="this.main.class" value="Mdl" />
+  <property name="this.dir" location="./" />
+  <property name="jnlp.file.name" value="mdl.jnlp" />
+  <property name="jnlp.file" location="${this.dir}/${jnlp.file.name}" />
+  <property name="prop.file" location="${this.dir}/mdl.properties" />
+  <property file="${prop.file}" />
+  <property name="ssh.install.dir" value="/home/fudaa/www/install" />
+  <property name="mdl.install.dir" value="${ssh.install.dir}/mdl" />
+
+  <!--Construit les 2 fichiers jnlp \xE0 utiliser: un avec la 3D et l'autre sans.
+  Le lien pour la 3D est r\xE9cup\xE9r\xE9 dans le fichier "java3D-link.txt"-->
+  <target name="buildJnlp" depends=".testChemins" description="Construit le contenu des fichiers jnlp">
+    <copy overwrite="true" file="${jnlp.file}" todir="${this.build.dir}" filtering="true">
+      <filterset>
+        <filter token="version" value="v${@version@}" />
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="deployAndSend"
+          depends="deploy,sendToFudaaFr"
+          description="Construit les jars et met a jour les sites distants">
+  </target>
+
+
+  <!--          depends="rebuild"-->
+  <target name="deploy"
+  depends="  .testChemins"
+          description="efface les classes, recompile le tout,cree et signe le jar. 
+    Les fichiers Jnlp sont \xE9galament cr\xE9\xE9s">
+    <antcall target="createJar" />
+    <antcall target="signJar" />
+    <!--Le build Zip reconstruit deja les fichiers jnlp -->
+    <antcall target="buildJnlp" />
+  </target>
+
+  <!--Envoie Tout ce qui est necessaire sauf l'aide:car elle ne bouge pas beaucoup! -->
+  <target name="sendToFudaaFr"
+          depends="setProxy,.testChemins"
+          description="Met a jour les sites distants ( sauf le jar d'aide)">
+    <scp file="${this.build.dir}/${jnlp.file.name}"
+         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}"
+         trust="true" />
+    <scp todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/images" trust="true">
+      <fileset dir="${basedir}/images" excludes="*.xcf" />
+    </scp>
+
+    <!--Pour que le tout marche il faut que le jar et le jar.pack.gz soient dans un dossier inf\xE9rieur-->
+    <scp file="${this.jar.file}.pack.gz"
+         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
+         trust="true" />
+    <scp file="${this.jar.file}"
+         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars/last"
+         trust="true" />
+
+    <scp file="${basedir}/jars/fudaa-mdl.jar.var"
+         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
+         trust="true" />
+    <scp file="${basedir}/jars/.htaccess"
+         todir="${ssh.username}:${ssh.password}@${ssh.host}:${mdl.install.dir}/jars"
+         trust="true" />
+  </target>
+
+
+
+  <target name="createJar" depends=".testCheminGenJar" description="cree fudaa_modeleur.jar">
+    <!--On prepare le dossier de destination et on efface les anciens jars pour \xE9viter les conflits:
+  des fois la tache genjar essaie de mettre \xE0 jour le jar ce qui prend du temps et peut \xEAtre source d'erreur
+  subtile-->
+    <mkdir dir="${this.jar.dir}" />
+    <delete file="${this.jar.file}" />
+    <genjar jarfile="${this.jar.file}">
+      <classpath path="${fudaaDist.classpath}" />
+      <manifest generateEntryAttributes="no">
+        <attribute name="Main-Class" value="org.fudaa.fudaa.modeleur.Mdl" />
+      </manifest>
+      <class name="org.fudaa.fudaa.modeleur.Mdl" />
+      <!--Cette classe GrData est ajout\xE9e \xE0 cause d'un bogue avec db4o qui ne retrouvait pas ces petits-->
+      <class name="org.fudaa.ebli.geometrie.GrData" />
+      <!--Pour ces librairies, tous les fichiers et toutes les ressources sont n\xE9cessaires-->
+      <library jar="${ctulu.lib.dir}/db4o.jar" />
+      <library jar="${ctulu.lib.dir}/fgis.jar" />
+      <library jar="${ctulu.lib.dir}/looks.jar" />
+      <library jar="${ctulu.lib.dir}/jep.jar" />
+      <!--Pas de CORBA pour Fudaa-Modeleur-->
+      <classfilter>
+        <exclude name="org.fudaa.dodico.corba." />
+        <exclude name="org.fudaa.dodico.usine." />
+      </classfilter>
+      <!--Les ressources utilis\xE9es-->
+      <!--On utilise pas les icones de bu mais ceux de crystal, d'ou les excludes-->
+      <resource>
+        <fileset dir="${fudaa.dist.classes.dir}">
+          <patternset refid="ressources.fic" />
+          <include name="org/fudaa/dodico/commun/" />
+          <include name="org/fudaa/ctulu/" />
+          <include name="com/memoire/bu/" />
+          <include name="com/hexidec/ekit/" />
+          <include name="com/memoire/dja/" />
+          <exclude name="com/memoire/dja/*_24.*" />
+          <exclude name="com/memoire/dja/logo*.*" />
+          <exclude name="com/memoire/dja/banner*.*" />
+          <exclude name="com/memoire/bu/alma_*" />
+          <exclude name="com/memoire/bu/*_16.*" />
+          <exclude name="com/memoire/bu/*_20.*" />
+          <exclude name="com/memoire/bu/*_22.*" />
+          <exclude name="com/memoire/bu/*_24.*" />
+          <exclude name="com/memoire/bu/*_26.*" />
+          <exclude name="com/memoire/bu/*_32.*" />
+          <exclude name="com/memoire/bu/*_48.*" />
+          <exclude name="com/memoire/bu/*_64.*" />
+          <exclude name="com/memoire/bu/crystal22_*" />
+          <include name="com/memoire/dnd/" />
+          <include name="com/memoire/bu/crystal*" />
+          <include name="org/fudaa/dodico/h2d/" />
+          <include name="org/fudaa/dodico/reflux/" />
+          <include name="org/fudaa/ebli/ressource/" />
+          <exclude name="org/fudaa/ebli/ressource/volume" />
+          <exclude name="org/fudaa/ebli/ressource/echellez*" />
+          <exclude name="org/fudaa/ebli/ressource/lumiere*" />
+          <exclude name="org/fudaa/ebli/ressource/texture*" />
+          <include name="org/fudaa/fudaa/ressource/" />
+          <exclude name="org/fudaa/fudaa/ressource/connecter*" />
+          <exclude name="org/fudaa/fudaa/ressource/astuces/" />
+          <include name="org/fudaa/fudaa/sig/" />
+          <include name="org/fudaa/fudaa/modeleur/" />
+          <include name="ghm/followgui/" />
+        </fileset>
+      </resource>
+    </genjar>
+    <!--Important car utilis\xE9 par geotools pour ces factories-->
+    <zip destfile="${this.jar.file}" update="true" compress="true">
+      <zipgroupfileset file="${ctulu.lib.dir}/fgis.jar"
+                       includes="META-INF/services/**,META-INF/registry*" />
+    </zip>
+  </target>
+
+
+  <!--Signe les jars cr\xE9es. Il faut utilise le sdk 1.5 pour cette tache a cause 
+  de l'exe pack-->
+  <target name="signJar" depends=".testChemins">
+    <property name="jarsigner" location="${java.home}/../bin/jarsigner">
+    </property>
+    <property file="${cert.dir}/fudaa-jar.txt" />
+    <signjar jar="${this.jar.file}"
+             alias="${fudaa.alias}"
+             storepass="${fudaa.password}"
+             keystore="${cert.dir}/fudaa.keystore" />
+    <echo>RePack200 ${this.jar.name}</echo>
+    <exec newenvironment="true"
+          dir="${this.jar.dir}"
+          executable="${java.home}/bin/pack200"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="--repack ${this.jar.name}" />
+    </exec>
+    <echo>RePack200 ${this.jar.name} END</echo>
+    <signjar jar="${this.jar.file}"
+             alias="${fudaa.alias}"
+             storepass="${fudaa.password}"
+             keystore="${cert.dir}/fudaa.keystore" />
+    <!--Je ne sais pas pourquoi il faut le faire 2 fois
+    il semble qu'il y ait un bug dans les exe java
+    -->
+    <!--A retester avec les nouvelles versions de Java-->
+    <echo>RePack200 ${this.jar.name} ENCORE ...</echo>
+    <exec newenvironment="true"
+          dir="${this.jar.dir}"
+          executable="${java.home}/bin/pack200"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="--repack ${this.jar.name}" />
+    </exec>
+    <echo>RePack200 ${this.jar.name} ENCORE END</echo>
+    <signjar jar="${this.jar.file}"
+             alias="${fudaa.alias}"
+             storepass="${fudaa.password}"
+             keystore="${cert.dir}/fudaa.keystore" />
+    <echo>Test ${this.jar.name}</echo>
+    <exec dir="${this.jar.dir}"
+          executable="${jarsigner}"
+          newenvironment="true"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="-verify ${this.jar.name}" />
+    </exec>
+    <echo>Test ${this.jar.name} END</echo>
+    <delete file="${this.jar.dir}/${this.jar.name}.pack.gz" />
+    <echo>Pack200 ${this.jar.name}</echo>
+    <exec newenvironment="true"
+          dir="${this.jar.dir}"
+          executable="${java.home}/bin/pack200"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="${this.jar.name}.pack.gz ${this.jar.name}" />
+    </exec>
+    <echo>Pack200 ${this.jar.name} END</echo>
+    <!--On teste la signature pour \xE9viter de balancer n'importe quoi sur le site-->
+    <echo>Test ${this.jar.name}.pack.gz</echo>
+    <exec newenvironment="true"
+          dir="${this.jar.dir}"
+          executable="${java.home}/bin/unpack200"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="${this.jar.name}.pack.gz ${this.jar.name}.pack.gz.jar" />
+    </exec>
+    <exec dir="${this.jar.dir}"
+          executable="${jarsigner}"
+          newenvironment="true"
+          failonerror="true"
+          vmlauncher="false">
+      <arg line="-verify ${this.jar.name}.pack.gz.jar" />
+    </exec>
+    <delete file="${this.jar.dir}/${this.jar.name}.pack.gz.jar" />
+    <echo>Test ${this.jar.name}.pack.gz END</echo>
+  </target>
+
+</project>

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/gpl.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/gpl.png)
===================================================================
(Binary files differ)

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/mdl-logo.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/mdl-logo.png)
===================================================================
(Binary files differ)

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/update.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/update.png)
===================================================================
(Binary files differ)

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png
===================================================================
(Binary files differ)

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/images/web.png (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/images/web.png)
===================================================================
(Binary files differ)

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/jars/.htaccess	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,14 +0,0 @@
-# Return the right mime type for JARs
-AddType application/x-java-archive .jar
-# Enable type maps
-AddHandler application/x-type-map .var
-Options +MultiViews
-
-<Files *.pack.gz>
-  # Enable the Content-Encoding header for .jar.pack.gz files
-  AddEncoding pack200-gzip .jar
-  # Stop mod_gzip from messing with the Content-Encoding
-  # response for these files
-  RemoveEncoding .gz
-</Files>
-

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/jars/.htaccess)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/.htaccess	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,14 @@
+# Return the right mime type for JARs
+AddType application/x-java-archive .jar
+# Enable type maps
+AddHandler application/x-type-map .var
+Options +MultiViews
+
+<Files *.pack.gz>
+  # Enable the Content-Encoding header for .jar.pack.gz files
+  AddEncoding pack200-gzip .jar
+  # Stop mod_gzip from messing with the Content-Encoding
+  # response for these files
+  RemoveEncoding .gz
+</Files>
+

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,9 +0,0 @@
-URI: fudaa-modeleur.jar
-
-URI: last/fudaa-modeleur.jar
-Content-Type: x-java-archive
-
-URI: last/fudaa-modeleur.jar.pack.gz
-Content-Type: x-java-archive
-Content-Encoding: pack200-gzip
-

Copied: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var (from rev 4350, trunk/fudaa_devel/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var)
===================================================================
--- branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var	                        (rev 0)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/jars/fudaa-mdl.jar.var	2009-01-14 01:46:16 UTC (rev 4353)
@@ -0,0 +1,9 @@
+URI: fudaa-modeleur.jar
+
+URI: last/fudaa-modeleur.jar
+Content-Type: x-java-archive
+
+URI: last/fudaa-modeleur.jar.pack.gz
+Content-Type: x-java-archive
+Content-Encoding: pack200-gzip
+

Deleted: branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp
===================================================================
--- trunk/fudaa_devel/fudaa-distrib/modeleur/mdl.jnlp	2009-01-13 20:42:41 UTC (rev 4350)
+++ branches/Prepro-0.92-SNAPSHOT/fudaa-distrib/modeleur/mdl.jnlp	2009-01-14 01:46:16 UTC (rev 4353)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp
-  spec="1.0+"
-  codebase="http://fudaa.fr/install/mdl"
-  href="mdl.jnlp">
-  <information>
-    <title>Fudaa-Modeleur</title>
-    <vendor>CETMEF DRIM</vendor>
-    <homepage href="http://fudaa.fr"/>
-    <description>Fudaa-Modeleur @version@</description>
-    <description kind="tooltip">Fudaa-Modeleur </description>
-        <description kind="short">Fudaa-Modeleur </description>
-    <icon href="images/mdl-logo.png"/>
-   <offline-allowed/>
-   <shortcut online="false">
-     <desktop/>
-     <menu submenu="Fudaa-Modeleur "/>
-    </shortcut>
-  </information>
-<!--EN-->
-  <information ...
 
[truncated message content]

[Fudaa-svn-commit] SF.net SVN: fudaa:[4353] branches/Prepro-0.92-SNAPSHOT

https://gitlab.com/fudaa

[Fudaa-svn-commit] SF.net SVN: fudaa:[4353] branches/Prepro-0.92-SNAPSHOT