[Fudaa-svn-commit] SF.net SVN: fudaa:[7170] trunk/soft/fudaa-crue

[<de...@us...>]

Revision: 7170
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7170&view=rev
Author:   deniger
Date:     2012-05-08 15:58:05 +0000 (Tue, 08 May 2012)
Log Message:
-----------
otfa batch

Modified Paths:
--------------
    trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml
    trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java
    trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java

Modified: trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml
===================================================================
--- trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml	2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/crue-server/nbactions-noIntegrationTests.xml	2012-05-08 15:58:05 UTC (rev 7170)
@@ -7,7 +7,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
             </goals>
             <properties>
-                <exec.args>-DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+                <exec.args>-DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
                 <exec.executable>java</exec.executable>
                 <exec.classpathScope>runtime</exec.classpathScope>
             </properties>
@@ -19,7 +19,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
             </goals>
             <properties>
-                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+                <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
                 <exec.executable>java</exec.executable>
                 <exec.classpathScope>runtime</exec.classpathScope>
                 <jpda.listen>true</jpda.listen>
@@ -32,7 +32,7 @@
                 <goal>org.codehaus.mojo:exec-maven-plugin:1.2:exec</goal>
             </goals>
             <properties>
-                <exec.args>${profiler.args} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-valide.otfa.xml'</exec.args>
+                <exec.args>${profiler.args} -DSiteConfigDir="C:\Data\etc" -classpath %classpath ${packageClassName} 'C:\Data\otfa-simple-invalide.otfa.xml'</exec.args>
                 <exec.executable>${profiler.java}</exec.executable>
                 <profiler.action>profile</profiler.action>
             </properties>

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java	2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/OtfaUtils.java	2012-05-08 15:58:05 UTC (rev 7170)
@@ -4,7 +4,6 @@
  */
 package org.fudaa.fudaa.crue.otfa;
 
-import java.io.File;
 import java.util.List;
 import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneLineResult;
 import org.fudaa.dodico.crue.projet.otfa.OtfaCampagneResult;

Modified: trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java
===================================================================
--- trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java	2012-05-08 15:48:43 UTC (rev 7169)
+++ trunk/soft/fudaa-crue/ui-otfa/src/main/java/org/fudaa/fudaa/crue/otfa/service/OtfaService.java	2012-05-08 15:58:05 UTC (rev 7170)
@@ -103,6 +103,10 @@
     if (addState) {
       dynamicContent.add(OtfaState.OPENED);
     }
+    if (campagne.getResult().getGlobalValidation() != null && campagne.getResult().getGlobalValidation().containsSomething()) {
+      LogsDisplayer.displayError(campagne.getResult().getGlobalValidation(),
+                                 campagne.getResult().getGlobalValidation().getMainLog().getDesci18n());
+    }
   }
 
   public void unsetResultat() {
@@ -217,7 +221,8 @@
       return;
     }
     OtfaExecutor executor = new OtfaExecutor(configurationManagerService.getCoeurManager(),
-                                             installationService.getConnexionInformation(), postRunService.getCalculCrueRunnerManagerBatch(),
+                                             installationService.getConnexionInformation(),
+                                             postRunService.getCalculCrueRunnerManagerBatch(),
                                              configurationManagerService.getOptionsManager().createOptions());
     final LaunchOtfaCampagneProcess process = new LaunchOtfaCampagneProcess(executor, getCurrentOTFA().getOtfaCampagne());
     final OtfaCampagneResult result = CrueProgressUtils.showProgressDialogAndRun(process, NbBundle.getMessage(OtfaService.class,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.