Ignore:
Timestamp:
06/07/07 10:58:12 (5 years ago)
Author:
anp
Message:

sendServerGenDeploy : gestion des modes actif et passif

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/sm_sendServerGenDeploy/build.xml

    r8838 r9271  
    1212                <resultat agent="/@@/server.password" result="server.password"/> 
    1313                <resultat agent="/@@/server.basedir" result="server.basedir"/> 
    14                          
     14                <resultat agent="/@@/server.mode" result="server.mode"/> 
     15                 
     16                <if> 
     17                <equals arg1="${server.mode}" arg2="active"/> 
     18                <then> 
     19                    <var name="server.isPassive" value="no"/> 
     20                </then> 
     21                        <else> 
     22                                <var name="server.isPassive" value="yes"/> 
     23                        </else> 
     24            </if> 
     25                                 
    1526                <tstamp><format property="vTimestamp" pattern="d-MMMM-yyyy HH:mm" locale="en"/></tstamp> 
    1627                 
    … …  
    2637                <concat destfile="${vReportFile}" append="true"><![CDATA[<h3>Répertoire principal : <span class="paramVal">${server.basedir}</span></h3>]]></concat> 
    2738                <concat destfile="${vReportFile}" append="true"><![CDATA[<h3>Compte utilisateur : <span class="paramVal">${server.user}</span></h3>]]></concat> 
    28                 <concat destfile="${vReportFile}" append="true"><![CDATA[<h3>Mode d'éxport : <span class="paramVal">${mode}</span></h3>]]></concat> 
     39                <concat destfile="${vReportFile}" append="true"><![CDATA[<h3>Envoi des contenus : <span class="paramVal">${mode}</span></h3>]]></concat> 
     40                <concat destfile="${vReportFile}" append="true"><![CDATA[<h3>Mode de communication FTP : <span class="paramVal">${server.mode}</span></h3>]]></concat> 
    2941                <concat destfile="${vReportFile}" append="true"><![CDATA[<br/><p>Exporté le : ${vTimestamp}</p><hr/>]]></concat> 
    3042                 
    … …  
    131143                <!-- création du répertoire principal (indispensable si il n'existe pas) --> 
    132144                <concat destfile="${vReportFile}" append="true"><![CDATA[<h4>- Création du répertoire :</h4><p>${server.basedir}</p>]]></concat> 
    133                 <ftp retriesAllowed="${vRetriesAllowed}" action="mkdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"/> 
     145                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" action="mkdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"/> 
    134146                <!-- export des fichiers modifiés --> 
    135147                <concat destfile="${vReportFile}" append="true"><![CDATA[<h4>- Export des fichiers modifiés :</h4><p>${site.files.modify.showFileList}</p>]]></concat> 
    136148                <concat destfile="${vReportFile}" append="true"><![CDATA[<h4>- Export des fichiers ajoutés :</h4><p>${site.files.added.showFileList}</p>]]></concat> 
    137                 <ftp retriesAllowed="${vRetriesAllowed}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     149                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    138150                    <fileset refid="site.files.modify"/> 
    139151                        <fileset refid="site.files.added"/> 
    … …  
    143155                <concat destfile="${vReportFile}" append="true"><![CDATA[<h4>- Suppression des fichiers :</h4><p>${site.files.deleted.showFileList}</p>]]></concat> 
    144156                <!-- NOTE : les fichiers possédant un espace ne sont pas supprimés... pb avec includes --> 
    145                 <ftp skipfailedtransfers="true" retriesAllowed="${vRetriesAllowed}" action="delete" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     157                <ftp skipfailedtransfers="true" passive="${server.isPassive}" retriesAllowed="${vRetriesAllowed}" action="delete" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    146158                        <fileset includes="${site.files.deleted.fileList}"/> 
    147159                </ftp> 
    … …  
    149161                <!-- suppression des répertoires obsolètes --> 
    150162                <concat destfile="${vReportFile}" append="true"><![CDATA[<h4>- Suppression des répertoires :</h4><p>${site.rep.deleted.showFileList}</p>]]></concat> 
    151                 <ftp skipfailedtransfers="true" retriesAllowed="${vRetriesAllowed}" action="rmdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     163                <ftp skipfailedtransfers="true" passive="${server.isPassive}" retriesAllowed="${vRetriesAllowed}" action="rmdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    152164                        <fileset includes="${site.rep.deleted.fileList}"/> 
    153165                </ftp> 
    154166                 
    155167                <!-- on réenvoit ts les nvx fichiers (sert ds le cas d'un changement de l'URL du serveur FTP : le diff n'a pas de sens) --> 
    156                 <ftp notExist="true" retriesAllowed="${vRetriesAllowed}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     168                <ftp notExist="true" passive="${server.isPassive}" retriesAllowed="${vRetriesAllowed}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    157169                    <fileset dir="${vTmpRep}" includes="**/**"/> 
    158170                </ftp> 
    … …  
    170182                <ant target="xFullReplaceLocalCopy"/> 
    171183                <!-- création du répertoire --> 
    172                 <ftp retriesAllowed="${vRetriesAllowed}" action="mkdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"/> 
     184                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" action="mkdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"/> 
    173185                <!-- envoie de tout le site --> 
    174                 <ftp retriesAllowed="${vRetriesAllowed}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     186                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" binary="true" action="send" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    175187                    <fileset dir="${vOutDataRep}"/> 
    176188                </ftp> 
    … …  
    182194        <target name="fullCopyWithDelete" if="export.mode.purgeAndFull"> 
    183195                <!-- Suppression des fichiers puis des répertoires (on ne peut supprimer un répertoire non vide) --> 
    184                 <ftp retriesAllowed="${vRetriesAllowed}" action="del" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     196                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" action="del" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    185197                        <fileset> 
    186198                      <include name="**/**"/> 
    187199                    </fileset> 
    188200                </ftp> 
    189                 <ftp retriesAllowed="${vRetriesAllowed}" action="rmdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
     201                <ftp retriesAllowed="${vRetriesAllowed}" passive="${server.isPassive}" action="rmdir" remotedir="${server.basedir}" server="${server.url}" userid="${server.user}" password="${server.password}"> 
    190202                        <fileset> 
    191203                      <include name="**/**"/> 
Note: See TracChangeset for help on using the changeset viewer.