From 7afd5c506171b8da69d6eed6e93ae1f8a1cb165b Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 5 Jun 2012 13:28:24 +0000 Subject: [PATCH] Merge from V6_5_BR 05/06/2012 --- Makefile.am | 2 +- build_cmake | 2 +- build_cmake.bat | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 4 ++-- doc/Makefile.am | 2 +- doc/job.rst | 7 ++++++- idl/JOBMANAGER_IDL.idl | 2 +- idl/Makefile.am | 2 +- m4/ac_cxx_option.m4 | 2 +- m4/ac_linker_options.m4 | 2 +- m4/acx_pthread.m4 | 2 +- m4/check_boost.m4 | 2 +- m4/check_omniorb.m4 | 2 +- m4/check_salome.m4 | 2 +- m4/check_sphinx.m4 | 2 +- m4/i2_check_qt4.m4 | 2 +- m4/production.m4 | 2 +- src/Makefile.am | 2 +- src/bases/BL_Exception.cxx | 2 +- src/bases/BL_Exception.hxx | 2 +- src/bases/BL_Traces.hxx | 2 +- src/bases/Makefile.am | 2 +- src/bases/make_begin.am | 2 +- src/engine/BL_Engine.hxx | 26 ++++++++++++------------ src/engine/BL_Job.cxx | 2 +- src/engine/BL_Job.hxx | 2 +- src/engine/BL_JobsManager.cxx | 2 +- src/engine/BL_JobsManager.hxx | 2 +- src/engine/BL_Observer.hxx | 2 +- src/engine/BL_SALOMEServices.cxx | 2 +- src/engine/BL_SALOMEServices.hxx | 2 +- src/engine/Makefile.am | 2 +- src/genericgui/BL_Buttons.cxx | 2 +- src/genericgui/BL_Buttons.hxx | 2 +- src/genericgui/BL_CreateJobWizard.cxx | 2 +- src/genericgui/BL_CreateJobWizard.hxx | 2 +- src/genericgui/BL_GenericGui.cxx | 2 +- src/genericgui/BL_GenericGui.hxx | 2 +- src/genericgui/BL_GenericGuiDefines.hxx | 26 ++++++++++++------------ src/genericgui/BL_JobTab.cxx | 2 +- src/genericgui/BL_JobTab.hxx | 2 +- src/genericgui/BL_JobsManager_QT.cxx | 2 +- src/genericgui/BL_JobsManager_QT.hxx | 2 +- src/genericgui/BL_JobsTable.cxx | 2 +- src/genericgui/BL_JobsTable.hxx | 2 +- src/genericgui/BL_QModelManager.cxx | 2 +- src/genericgui/BL_QModelManager.hxx | 2 +- src/genericgui/BL_Summary.cxx | 2 +- src/genericgui/BL_Summary.hxx | 2 +- src/genericgui/JM_EditSalomeResource.cxx | 2 +- src/genericgui/JM_EditSalomeResource.hxx | 2 +- src/genericgui/JM_ResourceCatalog.cxx | 2 +- src/genericgui/JM_ResourceCatalog.hxx | 2 +- src/genericgui/JM_SalomeResource.cxx | 2 +- src/genericgui/JM_SalomeResource.hxx | 2 +- src/genericgui/Makefile.am | 2 +- src/salomegui/BL_SalomeGui.cxx | 2 +- src/salomegui/BL_SalomeGui.hxx | 2 +- src/salomegui/JOBMANAGER_version.h.in | 5 +---- src/salomegui/Makefile.am | 2 +- src/salomegui/resources/SalomeApp.xml.in | 2 +- src/standalone/Makefile.am | 2 +- src/standalone/main.cxx | 2 +- src/standalone/start_jobmanager.sh.in | 2 +- src/wrappers/BL_MainWindows_Qt.cxx | 2 +- src/wrappers/BL_MainWindows_Qt.hxx | 2 +- src/wrappers/BL_MainWindows_SALOME.cxx | 2 +- src/wrappers/BL_MainWindows_SALOME.hxx | 2 +- src/wrappers/BL_MainWindows_Wrap.hxx | 2 +- src/wrappers/Makefile.am | 2 +- 72 files changed, 102 insertions(+), 100 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0e85eca..77eedc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake b/build_cmake index 9bb5b32..a81bdd4 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/build_cmake.bat b/build_cmake.bat index ca06c2a..b669ddb 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2009-2011 CEA/DEN, EDF R&D +@REM Copyright (C) 2009-2012 CEA/DEN, EDF R&D @REM @REM This library is free software; you can redistribute it and/or @REM modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index bdbf715..0f0908e 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/clean_configure b/clean_configure index 14480bd..02e09a0 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/configure.ac b/configure.ac index 280277d..c3640f9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,7 @@ # -- # ----------------------------------------------------------------------------- # -AC_INIT([JOBMANAGER project], [6.4.0], [andre.ribes@edf.fr], [JobManager-Module]) +AC_INIT([JOBMANAGER project], [6.5.0], [andre.ribes@edf.fr], [JobManager-Module]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_HEADER(jobmanager_config.h) diff --git a/doc/Makefile.am b/doc/Makefile.am index c32c941..ab44650 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/doc/job.rst b/doc/job.rst index 8c424a6..ecb98a8 100644 --- a/doc/job.rst +++ b/doc/job.rst @@ -57,9 +57,14 @@ The second table below describes the attributes of computation requirements. **Attribute** **Description** ======================== ============================================================================== **Maximum duration** It's the maximum expected duration of the job. When a batch manager is used, this - time is interpreted as a **walltime** and not as a **cputime**. + time is interpreted as a **walltime** and not as a **cputime**. If maximum + duration is set to 0, the time will be set to the default value of the + batch queue selected. **Number of cpu** It's the number of cpus/cores requested. **Memory** It's the amount of memory per node expected. +**Queue** It's optional. It permits to choose a specific batch queue on the targeted cluster. + If it is not defined, most of the batch systems will affect your job to the queue + that fits with the other attributes requirements. ======================== ============================================================================== Job's states diff --git a/idl/JOBMANAGER_IDL.idl b/idl/JOBMANAGER_IDL.idl index f4a5ab7..2b72d61 100644 --- a/idl/JOBMANAGER_IDL.idl +++ b/idl/JOBMANAGER_IDL.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/idl/Makefile.am b/idl/Makefile.am index a28fc44..321a10e 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/m4/ac_cxx_option.m4 b/m4/ac_cxx_option.m4 index e77bde8..bfd9b36 100644 --- a/m4/ac_cxx_option.m4 +++ b/m4/ac_cxx_option.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/ac_linker_options.m4 b/m4/ac_linker_options.m4 index 5035a57..8da3462 100644 --- a/m4/ac_linker_options.m4 +++ b/m4/ac_linker_options.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4 index 1adc965..11bc253 100644 --- a/m4/acx_pthread.m4 +++ b/m4/acx_pthread.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/check_boost.m4 b/m4/check_boost.m4 index 9eafb01..97112c4 100644 --- a/m4/check_boost.m4 +++ b/m4/check_boost.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/check_omniorb.m4 b/m4/check_omniorb.m4 index a51021d..eaf2398 100644 --- a/m4/check_omniorb.m4 +++ b/m4/check_omniorb.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/check_salome.m4 b/m4/check_salome.m4 index f3f9481..e3848cf 100644 --- a/m4/check_salome.m4 +++ b/m4/check_salome.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/check_sphinx.m4 b/m4/check_sphinx.m4 index 636a2ae..de4082c 100644 --- a/m4/check_sphinx.m4 +++ b/m4/check_sphinx.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/i2_check_qt4.m4 b/m4/i2_check_qt4.m4 index d1100ee..81bcc06 100644 --- a/m4/i2_check_qt4.m4 +++ b/m4/i2_check_qt4.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/m4/production.m4 b/m4/production.m4 index d0fb59b..d69e5bc 100644 --- a/m4/production.m4 +++ b/m4/production.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2009-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2009-2012 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/src/Makefile.am b/src/Makefile.am index 9e87bd5..8ae3eb6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/bases/BL_Exception.cxx b/src/bases/BL_Exception.cxx index c048b19..d925307 100644 --- a/src/bases/BL_Exception.cxx +++ b/src/bases/BL_Exception.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/bases/BL_Exception.hxx b/src/bases/BL_Exception.hxx index d69869a..4d78925 100644 --- a/src/bases/BL_Exception.hxx +++ b/src/bases/BL_Exception.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/bases/BL_Traces.hxx b/src/bases/BL_Traces.hxx index c035a73..1e30b07 100644 --- a/src/bases/BL_Traces.hxx +++ b/src/bases/BL_Traces.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/bases/Makefile.am b/src/bases/Makefile.am index 0db5150..0bb9bca 100644 --- a/src/bases/Makefile.am +++ b/src/bases/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/bases/make_begin.am b/src/bases/make_begin.am index b2342f1..c9741e1 100644 --- a/src/bases/make_begin.am +++ b/src/bases/make_begin.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_Engine.hxx b/src/engine/BL_Engine.hxx index 1299914..6551201 100755 --- a/src/engine/BL_Engine.hxx +++ b/src/engine/BL_Engine.hxx @@ -1,20 +1,20 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __BL_ENGINE_HXX__ #define __BL_ENGINE_HXX__ diff --git a/src/engine/BL_Job.cxx b/src/engine/BL_Job.cxx index 19b8084..46939ab 100644 --- a/src/engine/BL_Job.cxx +++ b/src/engine/BL_Job.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_Job.hxx b/src/engine/BL_Job.hxx index d1355b2..d4e3da0 100644 --- a/src/engine/BL_Job.hxx +++ b/src/engine/BL_Job.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_JobsManager.cxx b/src/engine/BL_JobsManager.cxx index c13730d..c7bf40e 100644 --- a/src/engine/BL_JobsManager.cxx +++ b/src/engine/BL_JobsManager.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_JobsManager.hxx b/src/engine/BL_JobsManager.hxx index 12621fa..180d40f 100644 --- a/src/engine/BL_JobsManager.hxx +++ b/src/engine/BL_JobsManager.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_Observer.hxx b/src/engine/BL_Observer.hxx index 9d7e74f..eb42870 100644 --- a/src/engine/BL_Observer.hxx +++ b/src/engine/BL_Observer.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx index e64ce12..273c517 100644 --- a/src/engine/BL_SALOMEServices.cxx +++ b/src/engine/BL_SALOMEServices.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/BL_SALOMEServices.hxx b/src/engine/BL_SALOMEServices.hxx index 8f35383..f3500cc 100644 --- a/src/engine/BL_SALOMEServices.hxx +++ b/src/engine/BL_SALOMEServices.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index c7c9ef9..98f4e2f 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_Buttons.cxx b/src/genericgui/BL_Buttons.cxx index a677db3..7b2ee7a 100644 --- a/src/genericgui/BL_Buttons.cxx +++ b/src/genericgui/BL_Buttons.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_Buttons.hxx b/src/genericgui/BL_Buttons.hxx index b4be4a4..27d92cf 100644 --- a/src/genericgui/BL_Buttons.hxx +++ b/src/genericgui/BL_Buttons.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx index 703d235..8b24f65 100644 --- a/src/genericgui/BL_CreateJobWizard.cxx +++ b/src/genericgui/BL_CreateJobWizard.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx index e039e97..b664914 100644 --- a/src/genericgui/BL_CreateJobWizard.hxx +++ b/src/genericgui/BL_CreateJobWizard.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx index 9fd175f..b195661 100644 --- a/src/genericgui/BL_GenericGui.cxx +++ b/src/genericgui/BL_GenericGui.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_GenericGui.hxx b/src/genericgui/BL_GenericGui.hxx index 0f3d824..6310175 100644 --- a/src/genericgui/BL_GenericGui.hxx +++ b/src/genericgui/BL_GenericGui.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_GenericGuiDefines.hxx b/src/genericgui/BL_GenericGuiDefines.hxx index f193413..186b80e 100755 --- a/src/genericgui/BL_GenericGuiDefines.hxx +++ b/src/genericgui/BL_GenericGuiDefines.hxx @@ -1,20 +1,20 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __BL_GENERICGUIDEFINES_HXX__ #define __BL_GENERICGUIDEFINES_HXX__ diff --git a/src/genericgui/BL_JobTab.cxx b/src/genericgui/BL_JobTab.cxx index 31ce3c1..91fbfd6 100644 --- a/src/genericgui/BL_JobTab.cxx +++ b/src/genericgui/BL_JobTab.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_JobTab.hxx b/src/genericgui/BL_JobTab.hxx index 7587d2f..44f5854 100644 --- a/src/genericgui/BL_JobTab.hxx +++ b/src/genericgui/BL_JobTab.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx index 8951cc6..5e83edd 100644 --- a/src/genericgui/BL_JobsManager_QT.cxx +++ b/src/genericgui/BL_JobsManager_QT.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_JobsManager_QT.hxx b/src/genericgui/BL_JobsManager_QT.hxx index 18f3a26..d26d689 100644 --- a/src/genericgui/BL_JobsManager_QT.hxx +++ b/src/genericgui/BL_JobsManager_QT.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx index 5782465..fe4b856 100644 --- a/src/genericgui/BL_JobsTable.cxx +++ b/src/genericgui/BL_JobsTable.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_JobsTable.hxx b/src/genericgui/BL_JobsTable.hxx index 2f850bf..2a356e3 100644 --- a/src/genericgui/BL_JobsTable.hxx +++ b/src/genericgui/BL_JobsTable.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_QModelManager.cxx b/src/genericgui/BL_QModelManager.cxx index aeb34cb..a8324ec 100644 --- a/src/genericgui/BL_QModelManager.cxx +++ b/src/genericgui/BL_QModelManager.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_QModelManager.hxx b/src/genericgui/BL_QModelManager.hxx index 8bfd7f7..d5dfee5 100644 --- a/src/genericgui/BL_QModelManager.hxx +++ b/src/genericgui/BL_QModelManager.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_Summary.cxx b/src/genericgui/BL_Summary.cxx index e91502b..cd58ab8 100644 --- a/src/genericgui/BL_Summary.cxx +++ b/src/genericgui/BL_Summary.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/BL_Summary.hxx b/src/genericgui/BL_Summary.hxx index ea9807c..9cf5fcd 100644 --- a/src/genericgui/BL_Summary.hxx +++ b/src/genericgui/BL_Summary.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_EditSalomeResource.cxx b/src/genericgui/JM_EditSalomeResource.cxx index 93f26ad..9d1edf6 100644 --- a/src/genericgui/JM_EditSalomeResource.cxx +++ b/src/genericgui/JM_EditSalomeResource.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_EditSalomeResource.hxx b/src/genericgui/JM_EditSalomeResource.hxx index 8ef2fa0..0938ca8 100644 --- a/src/genericgui/JM_EditSalomeResource.hxx +++ b/src/genericgui/JM_EditSalomeResource.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_ResourceCatalog.cxx b/src/genericgui/JM_ResourceCatalog.cxx index 74d18bf..749f0af 100644 --- a/src/genericgui/JM_ResourceCatalog.cxx +++ b/src/genericgui/JM_ResourceCatalog.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_ResourceCatalog.hxx b/src/genericgui/JM_ResourceCatalog.hxx index 8b2ff17..2d1b2f5 100644 --- a/src/genericgui/JM_ResourceCatalog.hxx +++ b/src/genericgui/JM_ResourceCatalog.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_SalomeResource.cxx b/src/genericgui/JM_SalomeResource.cxx index 1c81f36..6c2cb9c 100644 --- a/src/genericgui/JM_SalomeResource.cxx +++ b/src/genericgui/JM_SalomeResource.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/JM_SalomeResource.hxx b/src/genericgui/JM_SalomeResource.hxx index 19f0a2e..dc80b1c 100644 --- a/src/genericgui/JM_SalomeResource.hxx +++ b/src/genericgui/JM_SalomeResource.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/genericgui/Makefile.am b/src/genericgui/Makefile.am index 0cbedac..0e68146 100644 --- a/src/genericgui/Makefile.am +++ b/src/genericgui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/salomegui/BL_SalomeGui.cxx b/src/salomegui/BL_SalomeGui.cxx index f107ceb..b71fd64 100644 --- a/src/salomegui/BL_SalomeGui.cxx +++ b/src/salomegui/BL_SalomeGui.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/salomegui/BL_SalomeGui.hxx b/src/salomegui/BL_SalomeGui.hxx index aa24ddc..a1f24af 100644 --- a/src/salomegui/BL_SalomeGui.hxx +++ b/src/salomegui/BL_SalomeGui.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/salomegui/JOBMANAGER_version.h.in b/src/salomegui/JOBMANAGER_version.h.in index ba83449..5621203 100644 --- a/src/salomegui/JOBMANAGER_version.h.in +++ b/src/salomegui/JOBMANAGER_version.h.in @@ -1,7 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public diff --git a/src/salomegui/Makefile.am b/src/salomegui/Makefile.am index a144849..8a01eab 100644 --- a/src/salomegui/Makefile.am +++ b/src/salomegui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009-2011 CEA/DEN, EDF R&D +# Copyright (C) 2009-2012 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/salomegui/resources/SalomeApp.xml.in b/src/salomegui/resources/SalomeApp.xml.in index 26ab6ee..bc8bb87 100644 --- a/src/salomegui/resources/SalomeApp.xml.in +++ b/src/salomegui/resources/SalomeApp.xml.in @@ -1,5 +1,5 @@