Changeset 7469

Timestamp:

11/23/06 19:47:05 (5 years ago)

Author:

sys

Message:

Suppr ancienne gestion lancement scTest

File:

• trunk/Jav_Builder/com/scenari/m/builder/gen/HModelGenerator.java (modified) (4 diffs)

trunk/Jav_Builder/com/scenari/m/builder/gen/HModelGenerator.java

@@ -74 +74 @@
 import com.scenari.m.co.agent.IWADialog;
 import com.scenari.m.co.agent.IWAgent;
+import com.scenari.m.co.agent.IWAgentComputor;
 import com.scenari.m.co.agent.IWAgentLinker;
-import com.scenari.m.co.agent.IWAgentComputor;
 import com.scenari.m.co.dialog.IHDialog;
 import com.scenari.m.co.donnee.HADonneeMgr;
@@ -103 +103 @@
 import com.scenari.s.fw.log.IHLogMessage;
 import com.scenari.s.fw.util.xml.HXmlWriterIO;
-import com.scenari.s.fw.util.xml.IHXmlWriter;
 import com.scenari.s.fw.utils.HPoolBuffer;
 import com.scenari.s.fw.utils.HUrl;
@@ -129 +128 @@
         /** Path vers le fichier application.ini de XulRunner. */
         public static String sTestPathAppIni = null;
-
-        /** @depracted Utile pour al version Gecko1.7 (avant XulRunner) */
-        public static String sTestPathDataTransfert = "{user.home}/Application Data/SCENARIbuilder/scTestDataTransfert.xml";
 
         public static String sTestUnivCode = "test";
@@ -1556 +1552 @@
 
                 fPhase = PHASE_DEPLOY;
-                // Génération du fichier de transfert de données
-                if (sTestPathAppIni != null) {
-                        // Nouvelle gestion XulRunner
-                        File vRoot = new File(WDonneeFixeSystemProps.hReplace(sTestPathApp));
-                        File vExe = new File(vRoot, sTestNameApp);
-
-                        String[] vArgs = { vExe.getCanonicalPath(), sTestPathAppIni, "-chromeCode", fChromeCode, "-chromeContentUrl", HUrl.hEncode(new File(fFolderEsContent.hGetUrlFileFormat()).toURL().toExternalForm(), HUrl.URLENCODING_UTF8), "-wspCode", vWspCode,
-                                        "-appliPath", new File(vRoot, sTestPathAppIni).getParentFile().getCanonicalPath(), "-contentLocale", sTestLocale, "-UILocale", sTestLocale };
-                        Runtime.getRuntime().exec(vArgs, null, vRoot);
-
-                } else {
-                        // Ancienne Gestion Gecko 1.7 à virer.
-                        File vTransfert = new File(WDonneeFixeSystemProps.hReplace(sTestPathDataTransfert));
-                        IHXmlWriter vWriter = new HXmlWriterIO(new OutputStreamWriter(new FileOutputStream(vTransfert), "UTF-8"));
-                        try {
-                                vWriter.hWriteHeaderXml("UTF-8");
-                                vWriter.hWriteStartTag("launchTest");
-                                vWriter.hWriteAttribut("chromeCode", fChromeCode);
-                                vWriter.hWriteAttribut("chromeContentUrl", new File(fFolderEsContent.hGetUrlFileFormat()).toURL().toExternalForm());
-                                vWriter.hWriteAttribut("wspCode", vWspCode);
-                                // vWriter.hWriteAttribut("serverUrl", "");
-                                vWriter.hWriteEndEmptyTag();
-                        } finally {
-                                vWriter.hClose();
-                        }
-
-                        try {
-                                File vRoot = new File(WDonneeFixeSystemProps.hReplace(sTestPathApp));
-                                File vExe = new File(vRoot, sTestNameApp);
-                                String[] vArgs = { vExe.getCanonicalPath(), "-datapath", vTransfert.getAbsolutePath() };
-                                Runtime.getRuntime().exec(vArgs, null, vRoot);
-                                // HLogMgr.hPublishTrace("exitValue=" + vProcess.exitValue());
-                        } catch (Exception e) {
-                                HLogMgr.hPublishException(e, "Echec au lancement de SCENARI test : " + sTestPathApp + "/" + sTestNameApp);
-                        }
-                }
+                File vRoot = new File(WDonneeFixeSystemProps.hReplace(sTestPathApp));
+                File vExe = new File(vRoot, sTestNameApp);
+
+                String[] vArgs = { vExe.getCanonicalPath(), sTestPathAppIni, "-chromeCode", fChromeCode, "-chromeContentUrl", HUrl.hEncode(new File(fFolderEsContent.hGetUrlFileFormat()).toURL().toExternalForm(), HUrl.URLENCODING_UTF8), "-wspCode", vWspCode,
+                                "-appliPath", new File(vRoot, sTestPathAppIni).getParentFile().getCanonicalPath(), "-contentLocale", sTestLocale, "-UILocale", sTestLocale };
+                Runtime.getRuntime().exec(vArgs, null, vRoot);
 
         }