diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests.cxx
index 2020c77af25d1565fd7cf2c7cb646c03ed98eba1..f7ac480c1d20332777dc4c71c47095efc257c01c 100755
--- a/Testing/Code/BasicFilters/otbBasicFiltersTests.cxx
+++ b/Testing/Code/BasicFilters/otbBasicFiltersTests.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/BasicFilters/otbFrostFilter.cxx b/Testing/Code/BasicFilters/otbFrostFilter.cxx
index a342556b10ef4f403cc204611be2e9b9220c806b..9e42ada37f6042d51e0815db67eeab3dba27d3fa 100644
--- a/Testing/Code/BasicFilters/otbFrostFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFrostFilter.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   26 janvier 2005
-  Version   :   
-  Role      :   Test la classe qui filtre un image a partir de l'algorithme de FROST
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #if defined(_MSC_VER)
diff --git a/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx b/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx
index 4f0a21ce28cddc8c85670dcd7e89a6e2304e6311..2e9d523f5cc44e941f9e7ba46b9bf19c1447abb5 100644
--- a/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbImageToPointSetFilterTest.cxx
@@ -1,11 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   23 janvier 2006
-  Role      :  ImageToPointSetFilter class testing
-  $Id$ 
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/BasicFilters/otbLeeFilter.cxx b/Testing/Code/BasicFilters/otbLeeFilter.cxx
index 1332605ee9a7cbefa9582efdf2f1dee655abd02e..26e8a4b2124c111b253dbf62538d99e70a58e26d 100755
--- a/Testing/Code/BasicFilters/otbLeeFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLeeFilter.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   23 janvier 2005
-  Version   :   
-  Role      :   Test la classe qui filtre un image a partir de l'algorithme de J.S. LEE
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #if defined(_MSC_VER)
diff --git a/Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx
index 5fd4724b041a93b20a90f10fa2f0bd062c1a05ac..c526ebd211e3e1daea05d34efebb17468e810583 100755
--- a/Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbCBAMIChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement CBAMI
-  $Id: otbCBAMIChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/ChangeDetection/otbChangeDetectionTests.cxx b/Testing/Code/ChangeDetection/otbChangeDetectionTests.cxx
index 4c3602c54de8fd39848ec80adad613c56143c014..1fc6c9e7a1a47f57fc42c3023c2b05305f7c134f 100755
--- a/Testing/Code/ChangeDetection/otbChangeDetectionTests.cxx
+++ b/Testing/Code/ChangeDetection/otbChangeDetectionTests.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx
index 03031ee30b47d1e6fdc2d9d84c1cf11a2f93c429..27e31b1e742a3f800226f5181a9a30b206fd58c3 100755
--- a/Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbCorrelChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement par correlation
-  $Id: otbCorrelChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx
index d9b7f338fd8145cfcac1ae03fd99cc3d4142cb29..794c64e2955a91c47f77a3fbde36621aaf45b0c2 100755
--- a/Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbJHMIChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement JHMIC
-  $Id: otbJHMICChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx
index 2b94f0c3bd111557d32db4397e1d2c5e8c4ce479..8b7f61ad113f883a82fe41b7b32f9aa478ea5c9f 100755
--- a/Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbLHMIChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement LHMI
-  $Id: otbLHMIChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx
index 2eb584fdebddd1276389ab73f29804c43d8efdb4..283ead5f23d5f5527e18fba327a4396ee57c30cb 100755
--- a/Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbMeanDiffChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement MeanDiff
-  $Id: otbMeanDiffChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx b/Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx
index c3ffaa884e38086890cfd4aeafa9737dd8eb4239..430282036bcf2fcf916314f696d7631ac7feac9f 100755
--- a/Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx
+++ b/Testing/Code/ChangeDetection/otbMeanRatioChangeDetectionTest.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   07 mars 2006
-  Version   :   
-  Role      :   Test le detecteur de changement MeanRatio
-  $Id: otbMeanRatioChangeDetectionTest.cxx 87 2006-02-01 14:57:15Z thomas $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 244824bf176dcccd8e4740bd717929f8e284fff3..ad2bacf42f18caff55904405f64ac06e2d376d0c 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -141,15 +141,15 @@ ADD_TEST(coTvMultiChannelROI_RGB2NG_PNG3 ${COMMON_TESTS}
          -startX 700 -startY 60 -sizeX 77 -sizeY 489 -channels 3 )
 
 ADD_TEST(coTvMultiChannelROI_5c_BSQ ${COMMON_TESTS}   
-  --compare-image ${TOL}  ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_1232.hd
-                    ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_1232.hd
+  --compare-binary  ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_12321.c1
+                    ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_12321.c1
          otbMultiChannelExtractROI 
          ${INPUTDATA}/poupees.hd 
-         ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_1232.hd
-         -startX 303 -startY 2 -sizeX 134  -sizeY 330 -channels 1 2 3 2 )
+         ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_12321.hd
+         -startX 303 -startY 2 -sizeX 134  -sizeY 330 -channels 1 2 3 2 1 )
 
 ADD_TEST(coTvMultiChannelROI_3c_BSQ ${COMMON_TESTS}   
-  --compare-binary  ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_1232.c3
+  --compare-binary  ${BASELINE}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_345.c1
                     ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_345.c1
          otbMultiChannelExtractROI 
          ${TEMP}/coMultiChannelExtractROI_RGB2NG_PNG_poupees_303_2_134_330_channels_1232.hd
diff --git a/Testing/Code/Common/otbCommonTests.cxx b/Testing/Code/Common/otbCommonTests.cxx
index f72d06ac34bdd0b33d0736c4537018fc81f1b7a5..b51432533e776d908cb76f75d7c4f44969aa30bf 100644
--- a/Testing/Code/Common/otbCommonTests.cxx
+++ b/Testing/Code/Common/otbCommonTests.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/Common/otbDrawLineSpatialObject.cxx b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
index 9f4cc3c7640d2859e3f9ee1f8893dc1060805fcb..98bae5ced4ea404a61d4fe892d2f2c78bf389b49 100755
--- a/Testing/Code/Common/otbDrawLineSpatialObject.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Version   :   
-  Role      :   Test du filtre DrawLineSpatialOjectImageFilter 
-  	    :   qui permet de dessiner une ligne dans une image 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
index d18b5f622e4b25a078d68ab81db01ec9fe23e13c..e58e2b94a28c39bf51a74a330e06696a0f8706bc 100755
--- a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   10 avril 2006
-  Version   :   
-  Role      :   Test le filtre DrawLineSpatialOjectListImageFilter 
-  	    :   qui permet de dessiner les lignes contenues dans une liste 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
index b79238c908cdceb16eabf820d38ef517044fdb4e..30e820fa86320945236549eedb06607cd1ed487b 100755
--- a/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectListNew.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre DrawLineSpatialOjectListImageFilter 
-  	    :   qui permet de dessiner les lignes contenues dans une liste 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
index eced5551f38f51f8ff35ec3ce1e6362e8aa4b99e..7606dafceb251631d01679a777378eaf3f690a23 100755
--- a/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectNew.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre DrawLineSpatialOjectImageFilter 
-  	    :   qui permet de dessiner une ligne sur une image 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbExtractROI.cxx b/Testing/Code/Common/otbExtractROI.cxx
index b1dbe8296b3c6c8c4aac31805e31e8d494d45243..7e7ab84443af6cc121e82d7dcc1c9ed3d86b4bcd 100755
--- a/Testing/Code/Common/otbExtractROI.cxx
+++ b/Testing/Code/Common/otbExtractROI.cxx
@@ -1,15 +1,22 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
+
 #include "itkExceptionObject.h"
 #include "itkImageFileReader.h"
 #include "itkImageFileWriter.h"
diff --git a/Testing/Code/Common/otbExtractROINew.cxx b/Testing/Code/Common/otbExtractROINew.cxx
index 0bc7417fb1cd9797f1b9563954e9f8edf6013fbc..214ac32612fa5a2d2e8261e57f972dcfa3ff1cb0 100644
--- a/Testing/Code/Common/otbExtractROINew.cxx
+++ b/Testing/Code/Common/otbExtractROINew.cxx
@@ -1,15 +1,22 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
+
 #include "itkExceptionObject.h"
 #include "itkImageFileReader.h"
 #include "itkImageFileWriter.h"
diff --git a/Testing/Code/Common/otbExtractROI_RGB.cxx b/Testing/Code/Common/otbExtractROI_RGB.cxx
index 899da842b98d884e0262bef42d01a5e1e3f16014..645b00d39679ff3030cfdb6a82cbc3cddb12558d 100755
--- a/Testing/Code/Common/otbExtractROI_RGB.cxx
+++ b/Testing/Code/Common/otbExtractROI_RGB.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image RGB
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
index fa914f480a967b73cbda5fcc847b18b9494b3c6c..00ba84ede42bf0a92dab9bc84a1237485755d4f0 100755
--- a/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
+++ b/Testing/Code/Common/otbImageToLineSpatialObjectListNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   06 avril 2006
-  Version   :   
-  Role      :   Test d'instanciation de la classe otbImageToLineSpatialObjectListFilter 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbLineSpatialObjectList.cxx b/Testing/Code/Common/otbLineSpatialObjectList.cxx
index c8f4d84b14fd5f431a192bd752083bb9ea08dd6a..75ad96201cf154240f1f3fea602084554928919c 100755
--- a/Testing/Code/Common/otbLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectList.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test de la classe LineSpatialObjectList
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 9e23e915d78d051697514138d696a45dacba82e5..d80f6eba11c0be733282e773fc2efa7b6b788ef4 100755
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -1,15 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valauers par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
@@ -20,7 +23,7 @@
 #include "otbMultiChannelExtractROI.h"
 
 
-#include "itkImage.h"
+#include "otbImage.h"
 
 
 
@@ -33,7 +36,7 @@ int generic_otbMultiChannelExtractROI( int argc, char ** argv, const char * inpu
 //        const char * outputFilename = argv[2];
 
 
-        typedef itk::Image<short,2> TypeImage;
+        typedef otb::Image<short,2> TypeImage;
         
         TypeImage::Pointer lima =  TypeImage::New();
         
diff --git a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
index 737ff00a346505e4153c3b4da865d5ccd6cca45c..dfee2960bf1666be092bf8874dad20e3704d02d9 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
@@ -1,15 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   21 avril 2006
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valauers par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
index 5174cf6a1eba83bb6e6728af15de82cb0a79f946..4fd382b49055dbbafeab78c98118e0215ec024a0 100755
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
@@ -1,15 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valeurs par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
index a886b3604e9630c4f19c3db109249f753c21ef17..bfe7a092407c9e23941906f1bfb4b29bf6452784 100644
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
@@ -1,15 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   27 avril 2006
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valeurs par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbPointSetSourceTest.cxx b/Testing/Code/Common/otbPointSetSourceTest.cxx
index b38999bef8ff10b11303149d0d1b711c33bc40c1..b39e4101780c57c5fb5abb7a2326630b1babe9ec 100644
--- a/Testing/Code/Common/otbPointSetSourceTest.cxx
+++ b/Testing/Code/Common/otbPointSetSourceTest.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. Imbo
-  Language  :   C++
-  Date      :   29 mars 2006
-  Version   :   
-  Role      :   PointSet Source Class
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
index 3535b97680fbf9fc6b6a5f3531509ac3e86d1a4f..24474e8e2b993705b7bc95779d4ab74d5f63358f 100755
--- a/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParser.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
index c6e126ef00ccac17e39bc6ffe9109421aa8ef0fc..a614ac17d67185757d2f2e9ca7b2881faff787bd 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserHelp.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
index b2a1a307caaa912e918bdfa616d8663649838b62..aa29132192281888613284f4082f74afc6e1bdbd 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserList.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
index 7d875ecec93206aa69b8e132752a8645ce531549..313e3e9ec0ed600c2236aee03417e0202fca32ee 100644
--- a/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
+++ b/Testing/Code/Common/otbTestCommandLineArgumentParserWithError.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono canal, dont les valeurs sont codées en "unsigned char"
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/Common/otbTestExtractROI.cxx b/Testing/Code/Common/otbTestExtractROI.cxx
index 74eb26fb39e579a50ec32bfe77955d844077becf..e8b884a09bb2951dbde7096bdde3ed4b53caf5cc 100755
--- a/Testing/Code/Common/otbTestExtractROI.cxx
+++ b/Testing/Code/Common/otbTestExtractROI.cxx
@@ -1,15 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valauers par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index a64985d790746dbf3e70e7d3d38d6ea354a255cf..ba5a248d95bc46557169fac7d7005ee5a12a032c 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   06 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
index f7e4e1c3c1e2eb8bceaf99b3dcecca6249986ac4..137608e81a2eeb14dc7049a3fb80fac10c1879ed 100755
--- a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSum.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   27 mars 2006
-  Version   :   
-  Role      :   Test du filtre réalisant la somme associative assymétrique
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
index b56b0cae5dcb01de2975757e188bce1d44bc8da5..5d10b1e191aedaad1c746d6458bf7665b1a65981 100755
--- a/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssociativeSymmetricalSumNew.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   27 mars 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre réalisant la somme 
-  		associative assymétrique
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
index aa223f270ed6475e8893a7e22bf928b3950529b5..02f0d81f498de54c50235039c7e6a2aeaa8096ac 100755
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   29 mars 2006
-  Version   :   
-  Role      : Test du filtre composite AssymmetricFusionOfLineDetector  
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
index 5a5e4dc224159df9549636aca6bc25ca413a26c7..f0f89465b48bc3ed5387f110fd06376447e72d18 100755
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   29 mars 2006
-  Version   :   
-  Role      : Test d'instanciation du filtre composite AssymmetricFusionOfLineDetector  
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentImage.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentImage.cxx
index 2ee8bd840ae02b13673968756a3f6f2062770f9e..67852d0a1f0dcdba1748e820e3b6481a70c2f593 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   10 mars 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
index 0a3a1f9439778015f93e571eac7799662bb2764f..136ee0dc26fca8d56dea661f112b059ca6c58e4f 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPath.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
index 1908d42417e520b0d8bee6d4578311de8b601a24..0ea51d7f46192df8338ec4e2cb30d87d970d3937 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathFloat.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
index b3d51c665181f21c2034902bfd44e13178fed3dd..b0acd6cf8274843d579068360af10e91f4b59012 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentPathNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbDrawPath.cxx b/Testing/Code/FeatureExtraction/otbDrawPath.cxx
index 30115d45f5dd735fb21149667fa7544e60470543..0e44fbebb139ad2a971c777f60ecb0552bfd6994 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPath.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   28 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
index 57dbbda04e3eeaeba9258f0d01fa69ca6225e8e6..f7d3aa1b6257b79529f94dc5feed00bb1038520e 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   06 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbDrawPathList.cxx b/Testing/Code/FeatureExtraction/otbDrawPathList.cxx
index 69a26ee8649b7560da50d4ce69f8e890664ce96b..bd2202a9483f95b707e7dac33fbafe7d12ea22df 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPathList.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPathList.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   06 fevrier 2006
-  Version   :   
-  Role      :   
-  $Id: $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
index 921ee3737ece51d730de074a8d2574b3de8f5bc5..e0f0ea904d7fcad38cf273cd4a98b713fed6da1c 100755
--- a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
+++ b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   19 avril 2006
-  Version   :   
-  Role      : Test du filtre composite ExtractSegmentsImageFilter  
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx b/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
index 0ee955b0b1dde960239e118bc573f07df902324f..c8f65004fcab642812af3683d565d8b69fe21605 100755
--- a/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbExtractSegmentsNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   19 avril 2006
-  Version   :   
-  Role      : Test du filtre composite ExtractSegmentsImageFilter  
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
index a9f73da249f0e5032d53608950bff3cb16dd39cc..cd952173fb080c8d1df00245d1bedb8f3932533d 100755
--- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
+++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
index 2e174f3d18814e52c35e14d13b1c8d909cc428f8..44eef6c839bde5a32bf0840083d1f99dd233cf71 100755
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P. IMBO
-  Language  :   C++
-  Date      :   7 avril 2006
-  Version   :   
-  Role      :   Unitary test for the otb::FillGapsFilter class
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
index 8eed063c82e6c713e26ff629807571b980644935..d76030447c21f3496c89942ad3cdc4e8c73a2b0c 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilterNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   7 avril 2006
-  Version   :   
-  Role      :   Test élémentaire de la classe otb::FillGapsFilter
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
index d7b20690d3dfa7f1b7f0e100a3225a4cf13326fd..f0359c7c15978ff0990ae4e053adc6b20e5cef44 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
index 8d946027af904f18a04a6e1aba1e5ef01e5cb370..2bbaa2aacd80f2d61f8b028a45bc2c6c9d37fbbe 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPath.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx b/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
index be00b15769ce855ee02b95df06beb1f8d2dbd7e6..73b40f81d3ee3e6783be0c559631ef1663dd57eb 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserPathNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbHarrisImage.cxx b/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
index 8c4eeaefe1f00fed23de7996566091e850ac077e..2f26474ae7f9c04aa5366d937c8800339a0154c8 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   28 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
index 29c7aba81e48d3737ce5d243a31e98fbc2b7d97e..b6822c0436ddccee741438ab610868b551c7ce5a 100644
--- a/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
+++ b/Testing/Code/FeatureExtraction/otbHarrisToPointSet.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   03 avril 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbHuImage.cxx b/Testing/Code/FeatureExtraction/otbHuImage.cxx
index 73e2c9c812aeb944fab6dbe9d319838f5caeef23..fa72a24472f7f317396d7111d0ed5d1984813a0f 100644
--- a/Testing/Code/FeatureExtraction/otbHuImage.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   10 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbHuPath.cxx b/Testing/Code/FeatureExtraction/otbHuPath.cxx
index b35a866effee792e34418f5f594464c58b0b27f7..5bf3f34881627aabe081382efd883cfbed7efd4d 100644
--- a/Testing/Code/FeatureExtraction/otbHuPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPath.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
index 0a3248d33b10102b8b866543f73289858b2c3a65..87b6199b77502fa37f09818560678aed6bc1d380 100644
--- a/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuPathNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   24 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
index f7c84603bd54a776de75cfcd99000da5a4e09990..db50833cfaf4428b6c67751ba27a7d64aca21600 100755
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetector.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes par correlation
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
index 20f14388c9297f33d086da89f2d663d3a5997bdd..06ea6b4fbddbf07c723c9506ddc6070e41bc30a6 100755
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes par correlation
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinearDirection.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinearDirection.cxx
index 0c024af3d48dcd485d0a6103e07830a16453cdc5..4a59e13b2b6951a8c71febd8f1308ca6b56a09bf 100755
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinearDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinearDirection.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   5 avril 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes par correlation
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
index 5804fe539efadd3fd9d8c5b1bedecf3a57f21f15..0e6e5a6215d2496a46fa0cd60ffac652733bf667 100755
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorNew.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   23 mars 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre de detection de lignes par correlation
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #if defined(_MSC_VER)
diff --git a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
index a19699503cbf7ba0f26054b8fee331d2b3b0e8e2..36f08fb2535fc5302d606f8bb92dc900ab7e7a83 100644
--- a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
@@ -1,12 +1,18 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes (instanciation)
-  $Id: otbLineRatioDetectorNew.cxx 506 2006-04-20 09:54:35Z caroline $
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #if defined(_MSC_VER)
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
index fcb3b69ba0e8cf56046290be2909e8e5cbb6f12b..fc38edfcecc2ee9c557b57565543f1fba07d4dea 100755
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetector.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
index 7c0d39cc145fad82aeb1464f714f0d359d038b84..ec306212cb7d8d42f9c2dac1215d52942b879542 100755
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinearDirection.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinearDirection.cxx
index 33d1361488a41db8d7a13ea327d036cee9352931..8151042cb3d0e1f73f85da0454ad43cc9217ac47 100755
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinearDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinearDirection.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   5 avril 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes (image de direction)
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
index c8f94d8d8f62618a364ddd6b2c79a2878761ab1d..0ee73a1d409a5c76127ff8d6cd2b2ffeb87c5ee5 100755
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de lignes (instanciation)
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLocalHough.cxx b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
index 8b09d2b09901a0df47d7e48595bfce1bdecf072c..a1bcb404750922c7e6b5959e5d432ef8afd70609 100755
--- a/Testing/Code/FeatureExtraction/otbLocalHough.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   11 avril 2006
-  Version   :   
-  Role      :   Test le filtre local de Hough 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
index 4172448ba52d2b52015f54669dbe7bb878a06794..c41ed8e39bb2b94c58f73b9b0c06c4a04a0cecc4 100755
--- a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   10 avril 2006
-  Version   :   
-  Role      :   Test le filtre Local Hough en dessinant les lignes 
-  	    :   dans une image 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx b/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
index 8f80e0557062f84cc4d860c3b84a185896d51158..886260fc0055674b0b9f474adedaf5e4485e8eb5 100755
--- a/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHoughNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   12 avril 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre local de Hough 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx b/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
index abf7fc95832eb08ee6eff45f88ba1acde70ece83..3274c5dc6f1e15656e955189c281bd624bca0002 100644
--- a/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbMultiplyByScalarImageTest.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   28 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
index 7a9f4f10ef3656ae2cf8ff5409382b0377642c9d..f45b13c2e85abbccdd162417151986d2d0852e68 100755
--- a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirection.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test du filtre de suppression par direction des pixels isoles 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
index d2eac292acf39f71052eee04660f375c7db0c954..4e7f2c0b6bc90c4543f304505164d7bc046796cd 100755
--- a/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbPixelSuppressionByDirectionNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   14 mars 2006
-  Version   :   
-  Role      :   Test d'instanciation du filtre de suppression par direction des pixels isoles 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
index 31efae030baeb31a17205f35948a63d0b2b13f66..b6f100c5436b1ec438bf2b60c8bf7ef1b10ec1c0 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - P.Imbo
-  Language  :   C++
-  Date      :   30 mars 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
index 2ac4897c6a04687536c3a82ed300d1d0f79ca932..07398f7d8d861654429e41edb5b5fee6b0da2b08 100755
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de contours (image intensite) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
index 0396c969fc2ff807d3f67a0512650fc4b8c81d1e..7596c50a851b18221fb7a626409998760f8d4f2e 100755
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   20 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de contours (image de direction) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
index 84e7c911a671498840e9ed234b83bb4b9c04bb7e..f7223b27ca884f1651718ddfb5c40e770c8b0097 100755
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mars 2006
-  Version   :   
-  Role      :   Test du filtre de detection de contours (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbCAIImageIOTestCanRead.cxx b/Testing/Code/IO/otbCAIImageIOTestCanRead.cxx
index 8e65d94cb0f84c660b4fa81084ab8df73e1f0bed..b5a702ce59bd1a1b25aa54a70ad570f229cbd14f 100755
--- a/Testing/Code/IO/otbCAIImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbCAIImageIOTestCanRead.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbCAIImageIOTestCanWrite.cxx b/Testing/Code/IO/otbCAIImageIOTestCanWrite.cxx
index d332f9bc8b0f7209f9d054ff6b9e83edb655e818..14d585542815dd602031f9d729515c0dd73d2d8d 100755
--- a/Testing/Code/IO/otbCAIImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbCAIImageIOTestCanWrite.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx b/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
index 13bb84effcfad1b35569ed172d37781f61100ea7..eaddedcebe4d57f9fab97e3046805dff67397763 100755
--- a/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbGDALImageIOTestCanRead.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx b/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
index a7129bb10d9fb2cc0765e26f86b5c253957e04ed..b7ed87b34cbcd83a73d24fa5b9bbee8493e04b3a 100644
--- a/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
+++ b/Testing/Code/IO/otbGDALImageIOTestCanWrite.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbIOTests.cxx b/Testing/Code/IO/otbIOTests.cxx
index 17b9df38bcdf54d45f0c9870a34cddf173fbb733..64c6f5140f95ae6a832f2f0131626dc7b8e58635 100755
--- a/Testing/Code/IO/otbIOTests.cxx
+++ b/Testing/Code/IO/otbIOTests.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/IO/otbImageFileReaderERS.cxx b/Testing/Code/IO/otbImageFileReaderERS.cxx
index 77318f0acdfae2f9a7d04fbe77d4542a6dd3d0c3..9fb4537d5e8dec817f5b65dea578f50a8a7b57c9 100644
--- a/Testing/Code/IO/otbImageFileReaderERS.cxx
+++ b/Testing/Code/IO/otbImageFileReaderERS.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileReaderONERA.cxx b/Testing/Code/IO/otbImageFileReaderONERA.cxx
index b3f24db3d6f73929c1c7d6d05ee415950fb36d36..442dd3f5930422ca99285f803cf48594287e27a6 100644
--- a/Testing/Code/IO/otbImageFileReaderONERA.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERA.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
index 3d42b42c15b86747eebf38547b40fc847ddd3fd0..0fdd0db20d30188f64a0b63d66800086a2495b14 100644
--- a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileReaderRGBTest.cxx b/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
index 026f47d92eb4ded17161d35719c2bf620e1a4db2..e81205f2983e1519ebaf0487d6998fb99bbc7f2f 100755
--- a/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRGBTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileReaderTest.cxx b/Testing/Code/IO/otbImageFileReaderTest.cxx
index 0c99d08b9bbc9d1132347ae4b3f2c0a498029293..c2f1d3db043c2c179686ea4bdef54e5bacc0141b 100755
--- a/Testing/Code/IO/otbImageFileReaderTest.cxx
+++ b/Testing/Code/IO/otbImageFileReaderTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
index 5c42901e8cb181d424d29b9c4a27bb93b028fc29..8810a341a61bc9087681188ec012eba2935160d8 100644
--- a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileWriterRGBTest.cxx b/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
index 3bafbe516f473ef3a165732b780b1f9ea1e6a726..52263edee0e3c462c4224e7d0f648dd0f7ebc68e 100755
--- a/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
+++ b/Testing/Code/IO/otbImageFileWriterRGBTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageFileWriterTest.cxx b/Testing/Code/IO/otbImageFileWriterTest.cxx
index 07643242a6450649d2d0bc68faedf0be72154f89..c2dd71258a8668a1aad5597be73472dfc74e02d4 100755
--- a/Testing/Code/IO/otbImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbImageFileWriterTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageIOFactoryTest.cxx b/Testing/Code/IO/otbImageIOFactoryTest.cxx
index 5fa66e981204c4d1ec649b3ab29cebdde4cd09c7..57b36488e2c7450958c6d20626295e8ac2fa23bb 100755
--- a/Testing/Code/IO/otbImageIOFactoryTest.cxx
+++ b/Testing/Code/IO/otbImageIOFactoryTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbImageTest.cxx b/Testing/Code/IO/otbImageTest.cxx
index 12e4a606dcc9a9b6ca168c8eb9fa3ddac0e93d59..4df18e62122f960e86179390e5e0bf6883128f59 100755
--- a/Testing/Code/IO/otbImageTest.cxx
+++ b/Testing/Code/IO/otbImageTest.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   27 mars 2006
-  Version   :   
-  Role      :   Test d'instanciation de la classe otb::Image
-  		Lecture de meta données
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbMultiToMonoChannelExtractROISAR.cxx b/Testing/Code/IO/otbMultiToMonoChannelExtractROISAR.cxx
index 12e250ff21ddb896aa556c84bb66cc3b96960f9f..1657997c39aa39198f67cc76266275f0a4fad718 100644
--- a/Testing/Code/IO/otbMultiToMonoChannelExtractROISAR.cxx
+++ b/Testing/Code/IO/otbMultiToMonoChannelExtractROISAR.cxx
@@ -1,18 +1,22 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   Test l'extraction d'une ROI dans une image mono ou multi canal, dont les valeurs sont codées en "unsigned char"
-                Les parametres de la ROI ne sont pas obligatoire, tout comme les canaux. Dans ce cas, les valeurs par défaut 
-                de la classe sont utilisées
-                
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
+
 #include "itkExceptionObject.h"
 
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx b/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
index ea747da506ff8564d4ba932387e9b8c0971b90ab..f6c001538fb558ccd39b34556b69baa117c56763 100644
--- a/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
+++ b/Testing/Code/IO/otbONERAImageIOTestCanRead.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
index 6708a03c11c111ea824565587aa3237020dfc144..679e019a6d1f84beee301e55d3b7ec691e34ce30 100755
--- a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbStreamingImageFilterTest.cxx b/Testing/Code/IO/otbStreamingImageFilterTest.cxx
index 8936a0be96abd5404fe1217bf921a602bdbeb642..a2f8dea99767b3af94e52eb6f5588ff49785669a 100755
--- a/Testing/Code/IO/otbStreamingImageFilterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFilterTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
index c021e891a912b1c4b832a5f82e560fdedf3e4847..eb0f1eaa694d673e9acba4872a257839014cf59b 100755
--- a/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
+++ b/Testing/Code/IO/otbVectorImageFileReaderWriterTest.cxx
@@ -1,4 +1,21 @@
-// $Id$
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
@@ -27,7 +44,7 @@ int otbVectorImageFileReaderWriterTest(int argc, char* argv[])
         typedef itk::VectorImage< InputPixelType,  Dimension >        InputImageType;
         typedef itk::VectorImage< OutputPixelType, Dimension >        OutputImageType;
 
-        typedef itk::ImageFileReader< InputImageType  >         ReaderType;
+        typedef otb::ImageFileReader< InputImageType  >         ReaderType;
         typedef otb::ImageFileWriter< OutputImageType >         WriterType;
 
         ReaderType::Pointer reader = ReaderType::New();
diff --git a/Testing/Code/IO/otbVectorImageTest.cxx b/Testing/Code/IO/otbVectorImageTest.cxx
index d89d863a5a610dada3272c31ca22d998fa037a85..63fea5129e3b5ec7c931de4c614fc2142b25956e 100755
--- a/Testing/Code/IO/otbVectorImageTest.cxx
+++ b/Testing/Code/IO/otbVectorImageTest.cxx
@@ -1,15 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - C.Ruffel
-  Language  :   C++
-  Date      :   09 mai 2006
-  Version   :   
-  Role      :   Test d'instanciation de la classe otb::VectorImage
-  		Lecture de meta données
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Installation/otbInstallationTest.cxx b/Testing/Code/Installation/otbInstallationTest.cxx
index ea3e72677ea46aa0edc2326236e500a127f379e0..c147b4981ea36a4c6d27a368fca740634ce37927 100644
--- a/Testing/Code/Installation/otbInstallationTest.cxx
+++ b/Testing/Code/Installation/otbInstallationTest.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 //
 // Cet exemple permet de montrer l'utilisation des différentes bibliothèques utilisées par l'OTB
 //
diff --git a/Testing/Code/Learning/SVMPointSetExample.cxx b/Testing/Code/Learning/SVMPointSetExample.cxx
index ea484cb01eeaa21d087fb6b02735afe617480651..ea1283aeac3751bddd76522352b7c8f9bb1ec590 100755
--- a/Testing/Code/Learning/SVMPointSetExample.cxx
+++ b/Testing/Code/Learning/SVMPointSetExample.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   5 May 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbLearningTests.cxx b/Testing/Code/Learning/otbLearningTests.cxx
index 3273180bcd9fed3705193d16b1b35724910c7beb..4056cba8a8d659550749b7c200b4a83e215a67aa 100644
--- a/Testing/Code/Learning/otbLearningTests.cxx
+++ b/Testing/Code/Learning/otbLearningTests.cxx
@@ -1,3 +1,22 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Testing/Code/Learning/otbSVMClassifierImage.cxx
index 52b20999af25a1f9eb6a489b186f8d75c21baec2..146ed089a7ad31936d747a7aedcfb63b27b64aa5 100644
--- a/Testing/Code/Learning/otbSVMClassifierImage.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   28 April 2006
-  Version   :   
-  Role      :   Test for the SVMClassifier class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMClassifierNew.cxx b/Testing/Code/Learning/otbSVMClassifierNew.cxx
index 683af441ae5a1b636bcf0eab448a0b013ef5f34a..03d0b27b156ee7a5202bc6fc2bf3ef80cf822193 100644
--- a/Testing/Code/Learning/otbSVMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierNew.cxx
@@ -1,15 +1,21 @@
-
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   28 April 2006
-  Version   :   
-  Role      :   Test for the SVMClassifier class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
index 12f0a1c5bc4ec412757c4893dbf2d18775436733..1e506ef322113f4177db7d1b3dfdf7238aa69ec7 100644
--- a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   28 April 2006
-  Version   :   
-  Role      :   Test for the SVMClassifier class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
index 6fd2d54fd8911c9d8a76c084bc7145d86409c945..09810063cf425172f57d1cc794af1db004573925 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMImageModelEstimator class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
index 70fe4a0f6ae552fa60c47ba034b460380029f5f0..932800c101e08f31b4a7bf80aa4ea79e7da7d0c7 100644
--- a/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
+++ b/Testing/Code/Learning/otbSVMImageModelEstimatorTrain.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMImageModelEstimator class (training) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMMembershipFunctionLoadModel.cxx b/Testing/Code/Learning/otbSVMMembershipFunctionLoadModel.cxx
index 72d9039986911394e5ba5f206125898239603464..7f4271dea4ccc5a719eedf4982c593ab08fec9b7 100644
--- a/Testing/Code/Learning/otbSVMMembershipFunctionLoadModel.cxx
+++ b/Testing/Code/Learning/otbSVMMembershipFunctionLoadModel.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMMembershipFunction class (load a model) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMMembershipFunctionNew.cxx b/Testing/Code/Learning/otbSVMMembershipFunctionNew.cxx
index dbcda6f26b554925d325018c737628bc5ee6fba0..a1d70fe79919dcd27367eb981e82856c46432e13 100644
--- a/Testing/Code/Learning/otbSVMMembershipFunctionNew.cxx
+++ b/Testing/Code/Learning/otbSVMMembershipFunctionNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMMembershipFunction class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMModelAllocateProblem.cxx b/Testing/Code/Learning/otbSVMModelAllocateProblem.cxx
index 6f37d3e2b29dfa869c2223c4ef85dae297fb3fab..c072d3b835d3863a96202ca2165d47d7336d4a27 100644
--- a/Testing/Code/Learning/otbSVMModelAllocateProblem.cxx
+++ b/Testing/Code/Learning/otbSVMModelAllocateProblem.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   29 April 2006
-  Version   :   
-  Role      :   Test for the SVMModel class (allocate problem) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMModelLoad.cxx b/Testing/Code/Learning/otbSVMModelLoad.cxx
index 6f22e73509b00355ffa4caef2d6171699f431a3b..190d13174749d2f58e1ab3c72d98dc809fd86ff5 100644
--- a/Testing/Code/Learning/otbSVMModelLoad.cxx
+++ b/Testing/Code/Learning/otbSVMModelLoad.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMModel class (loading a model) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMModelLoadSave.cxx b/Testing/Code/Learning/otbSVMModelLoadSave.cxx
index 9f6b21b86557dcb1bb4561d4528a056e54c781a9..4643158a19b0b39973bc4e7114f58eab902e18dc 100644
--- a/Testing/Code/Learning/otbSVMModelLoadSave.cxx
+++ b/Testing/Code/Learning/otbSVMModelLoadSave.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMModel class (loading and saving a model) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMModelNew.cxx b/Testing/Code/Learning/otbSVMModelNew.cxx
index 736a6d2eeb54f8c2eda0759607a561f72eed1948..a136ee34d20e903e8ff47ff33f43bcfc5969c568 100644
--- a/Testing/Code/Learning/otbSVMModelNew.cxx
+++ b/Testing/Code/Learning/otbSVMModelNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMModel class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx b/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
index d3216be2392e630e32238ce2630955f411b2d55c..88c779cbeec1e27a7175fd78f1e7a150bf505318 100644
--- a/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
+++ b/Testing/Code/Learning/otbSVMPointSetModelEstimatorNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   27 April 2006
-  Version   :   
-  Role      :   Test for the SVMPointSetModelEstimator class (instanciation) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx b/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
index f93470b35f6cceeef6238a5b10fe971fb5e6a8a6..e4820798b3eb2a3418310c93ef977c1fb606b9a8 100644
--- a/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
+++ b/Testing/Code/Learning/otbSVMPointSetModelEstimatorTrain.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Program   :   OTB (ORFEO ToolBox)
-  Authors   :   CNES - J.Inglada
-  Language  :   C++
-  Date      :   4 May 2006
-  Version   :   
-  Role      :   Test for the SVMPointSetModelEstimator class (training) 
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
 #endif
diff --git a/Testing/Code/Visu/otbImageView.cxx b/Testing/Code/Visu/otbImageView.cxx
index 36e0efad7ed562575560827aa9afea62f4a3c1e6..40acac79fda7f4d96084299059a76b9b1a86d9ac 100644
--- a/Testing/Code/Visu/otbImageView.cxx
+++ b/Testing/Code/Visu/otbImageView.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   Test les differents Image View
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 // OTB-FA-00026-CS
 #include <stdlib.h>
 #include "itkExceptionObject.h"
diff --git a/Testing/Code/Visu/otbImageViewer.cxx b/Testing/Code/Visu/otbImageViewer.cxx
index 3feac2b0080861b2e7224c43ad7a364b88f8b9c5..649764f9f6dec43abf76ef78f3232fa202da557c 100644
--- a/Testing/Code/Visu/otbImageViewer.cxx
+++ b/Testing/Code/Visu/otbImageViewer.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 // OTB-FA-00026-CS
 #include <stdlib.h>
 #include "itkExceptionObject.h"
diff --git a/Testing/Code/Visu/otbImageViewerAS.cxx b/Testing/Code/Visu/otbImageViewerAS.cxx
index ee94f90988992de5de70e5ac42c67999ecc29293..77f380530efe61591c6118776358b1edddecdc5b 100755
--- a/Testing/Code/Visu/otbImageViewerAS.cxx
+++ b/Testing/Code/Visu/otbImageViewerAS.cxx
@@ -1,15 +1,22 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - R.GARRIGUES
-  Language  :   C++
-  Date      :   27 avril 2006
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
+
 #include <stdlib.h>
 #include <iostream>
 #include "itkExceptionObject.h"
diff --git a/Testing/Code/Visu/otbImageViewerNew.cxx b/Testing/Code/Visu/otbImageViewerNew.cxx
index 74dd36d50e86fd1d089bdc1ebcdcf7cc71f92bb1..2ed808a48f71a11f5fc221736dee66a1101ed762 100644
--- a/Testing/Code/Visu/otbImageViewerNew.cxx
+++ b/Testing/Code/Visu/otbImageViewerNew.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CS - T.Feuvrier
-  Language  :   C++
-  Date      :   11 janvier 2005
-  Version   :   Test du ImageViewer
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 // OTB-FA-00026-CS
 #include <stdlib.h>
 #include "itkExceptionObject.h"
diff --git a/Testing/Code/Visu/otbImageViewerWithitkImage.cxx b/Testing/Code/Visu/otbImageViewerWithitkImage.cxx
index c25f9b41ffb8e08fab3dc69f8382d4e0d53dac15..8bdf1c7bdfb2e791fcf199580df6ea953290c561 100755
--- a/Testing/Code/Visu/otbImageViewerWithitkImage.cxx
+++ b/Testing/Code/Visu/otbImageViewerWithitkImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   14 March 2005
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #include <stdlib.h>
 #include "itkExceptionObject.h"
 
diff --git a/Testing/Code/Visu/otbImageViewerWithitkVectorImage.cxx b/Testing/Code/Visu/otbImageViewerWithitkVectorImage.cxx
index a781e3ee365dbf5ababbdfa83929afc9ac243bb1..13e6ba3eb5a7081a1c6d969a732952467f40173b 100755
--- a/Testing/Code/Visu/otbImageViewerWithitkVectorImage.cxx
+++ b/Testing/Code/Visu/otbImageViewerWithitkVectorImage.cxx
@@ -1,14 +1,21 @@
 /*=========================================================================
 
-  Programme :   OTB (ORFEO ToolBox)
-  Auteurs   :   CNES - J. Inglada
-  Language  :   C++
-  Date      :   14 March 2005
-  Version   :   
-  Role      :   
-  $Id$
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+
 #include <stdlib.h>
 #include "itkExceptionObject.h"
 
diff --git a/Testing/Code/Visu/otbVisuTests.cxx b/Testing/Code/Visu/otbVisuTests.cxx
index 33f5a009b91b479bf0aabacc58fa723c4bea8f65..bfeb73f33b5e7e9a6aa917993dab4bfd0efcc156 100755
--- a/Testing/Code/Visu/otbVisuTests.cxx
+++ b/Testing/Code/Visu/otbVisuTests.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 // this file defines the otbCommonTest for the test driver
 // and all it expects is that you have a function called RegisterTests
 #if defined(_MSC_VER)
diff --git a/Testing/Fa/AlignementsQB.cxx b/Testing/Fa/AlignementsQB.cxx
index 858d5e1772bd7c47e6eed7310abcd1b8e2207c50..23506a2694053ca06c16d159fdd656b6a453df07 100755
--- a/Testing/Fa/AlignementsQB.cxx
+++ b/Testing/Fa/AlignementsQB.cxx
@@ -1,3 +1,21 @@
+/*=========================================================================
+
+  Program:   ORFEO Toolbox
+  Language:  C++
+  Date:      $Date$
+  Version:   $Revision$
+
+
+  Copyright (c) Centre National d'Etudes Spatiales. All rights reserved.
+  See OTBCopyright.txt for details.
+
+
+     This software is distributed WITHOUT ANY WARRANTY; without even 
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+     PURPOSE.  See the above copyright notices for more information.
+
+=========================================================================*/
+
 #include <iostream>
 #include "itkPolyLineParametricPath.h"