From 2a399778554a69753628fd12edf41cd4616f2d6b Mon Sep 17 00:00:00 2001
From: Arnaud Jelmoni <arnaud.jelmoni@keyconsulting.fr>
Date: Fri, 27 Nov 2020 17:15:30 +0000
Subject: [PATCH] Replace sysout et syserr by slf4j

---
 .../ReadNumericAttributesImpl.java            |  4 --
 .../plugin/persistance/AnyAttribute.java      |  7 +-
 .../archiving/snap/api/DataBaseAPI.java       | 44 ++++++------
 .../lifecycle/DefaultLifeCycleManager.java    | 13 ++--
 .../snap/api/extractor/tools/Tools.java       | 13 ++--
 .../snap/api/manager/SnapManagerApi.java      |  2 +-
 .../snap/api/manager/SnapManagerImpl.java     |  5 +-
 .../spring/dao/ClasspathDAOBeansLoader.java   | 71 +++++++++----------
 .../persistence/spring/dto/CompositeId.java   |  7 +-
 .../api/persistence/spring/dto/ScNum2Val.java | 12 ++--
 .../snap/api/tools/SnapshotingException.java  | 10 ---
 .../snap/api/tools/StringFormater.java        | 12 ++--
 12 files changed, 98 insertions(+), 102 deletions(-)

diff --git a/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/ReadNumericAttributesImpl.java b/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/ReadNumericAttributesImpl.java
index 1456bcd..8bbf8e3 100644
--- a/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/ReadNumericAttributesImpl.java
+++ b/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/ReadNumericAttributesImpl.java
@@ -106,10 +106,6 @@ public class ReadNumericAttributesImpl extends ReadAttributesImpl implements Rea
 
         Map<String, Double> res = new Hashtable<String, Double>();
         for (int i = 0; i < this.attributes.length; i++) {
-//            if (attributesSortedByDevice[i] == null) {
-//                System.out.println("NULL !!!! 2/this.targets[i].get_name()/" + this.targets[i].get_name());
-//            }
-
             for (int j = 0; j < this.attributes[i].length; j++) {
                 res.put(this.targets[i].get_name() + "/" + this.attributes[i][j], attributesSortedByDevice[i][j]);
             }
diff --git a/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/persistance/AnyAttribute.java b/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/persistance/AnyAttribute.java
index efc967b..240cc8d 100644
--- a/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/persistance/AnyAttribute.java
+++ b/src/main/java/fr/soleil/actiongroup/collectiveaction/onattributes/plugin/persistance/AnyAttribute.java
@@ -24,6 +24,9 @@
  */
 package fr.soleil.actiongroup.collectiveaction.onattributes.plugin.persistance;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.esrf.Tango.DevState;
 import fr.esrf.TangoDs.TangoConst;
 import fr.soleil.actiongroup.collectiveaction.components.tangowrapping.DeviceAttributeWrapper;
@@ -35,6 +38,8 @@ import fr.soleil.actiongroup.collectiveaction.components.tangowrapping.TangoCons
  * @author CLAISSE
  */
 public class AnyAttribute {
+	final static Logger logger = LoggerFactory.getLogger(AnyAttribute.class);
+	
     private static final String SPECTRUM_SEPARATOR = ",";
 
     /**
@@ -203,7 +208,7 @@ public class AnyAttribute {
             _numberOfComponents = rawValueString == null ? 0 : rawValueString.length;
             break;
         default:
-            System.out.println("NO EXTRACTION " + attribute.getName());
+            logger.error("NO EXTRACTION " + attribute.getName());
         }
         return _numberOfComponents;
     }
diff --git a/src/main/java/fr/soleil/archiving/snap/api/DataBaseAPI.java b/src/main/java/fr/soleil/archiving/snap/api/DataBaseAPI.java
index 7f4ace9..6b3eb0c 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/DataBaseAPI.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/DataBaseAPI.java
@@ -375,13 +375,13 @@ public class DataBaseAPI {
         SnapshotingException archivingException1 = null, archivingException2 = null;
         try {
             // try oracle
-            System.out.println("DataBaseApi.connect_auto oracle: " + getUser() + "@" + getHost());
+        	logger.info("DataBaseApi.connect_auto oracle: " + getUser() + "@" + getHost());
             connect_oracle();
-            System.out.println("connection to oracle OK");
+            logger.info("connection to oracle OK");
             return;
         } catch (final SnapshotingException e) {
             // e.printStackTrace();
-            System.out.println("connection to oracle KO");
+        	logger.error("connection to oracle KO");
             final String message = SnapConst.SNAPSHOTING_ERROR_PREFIX + " : " + "CONNECTION FAILED !";
             final String reason = "Failed while executing DataBaseApi.connect_auto() method...";
             final String desc = "Failed while connecting to the Oracle archiving database";
@@ -389,13 +389,13 @@ public class DataBaseAPI {
         }
         try {
             // try MySQL;
-            System.out.println("DataBaseApi.connect_auto MySQL: " + getUser() + "@" + getHost());
+        	logger.info("DataBaseApi.connect_auto MySQL: " + getUser() + "@" + getHost());
             connect_mysql();
-            System.out.println("connection to MySQL OK");
+            logger.info("connection to MySQL OK");
             return;
         } catch (final SnapshotingException e) {
             // e.printStackTrace();
-            System.out.println("connection to MySQL KO");
+        	logger.error("connection to MySQL KO");
             final String message = SnapConst.SNAPSHOTING_ERROR_PREFIX + " : " + "CONNECTION FAILED !";
             final String reason = "Failed while executing DataBaseApi.connect_auto() method...";
             final String desc = "Failed while connecting to the MySQL archiving database";
@@ -422,7 +422,7 @@ public class DataBaseAPI {
         try {
             Class.forName("org.gjt.mm.mysql.Driver");
             final String url = ConfigConst.DRIVER_MYSQL + "://" + dbHostName + "/" + dbName + "?autoReconnect=true";
-            System.out.println("mysql URL " + url);
+            logger.debug("mysql URL " + url);
             connection = DriverManager.getConnection(url, userName, password);
             if (useLog4JDBC) {
                 connection = new net.sf.log4jdbc.ConnectionSpy(connection);
@@ -676,7 +676,7 @@ public class DataBaseAPI {
                 final String message = SnapConst.SNAPSHOTING_ERROR_PREFIX + " : " + SnapConst.QUERY_FAILURE;
                 final String reason = "Failed while executing DataBaseAPI.getMaxID() method...";
                 final String desc = "The table seem to be empty, please check it...";
-                System.out.println(new SnapshotingException(message, reason, ErrSeverity.WARN, desc, "").toString());
+                logger.error(new SnapshotingException(message, reason, ErrSeverity.WARN, desc, "").toString());
                 res = 0;
             }
         } catch (final SQLException e) {
@@ -1808,7 +1808,7 @@ public class DataBaseAPI {
         } catch (final SQLException e) {
             e.printStackTrace();
 
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_RO" + "\r\n"
+            logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_RO" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -1831,7 +1831,7 @@ public class DataBaseAPI {
         } catch (final SQLException e) {
             e.printStackTrace();
 
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeResultSet" + "\r\n"
+            logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeResultSet" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage());
         }
@@ -1847,7 +1847,7 @@ public class DataBaseAPI {
         } catch (final SQLException e) {
             e.printStackTrace();
 
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeStatement" + "\r\n"
+            logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeStatement" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage());
         }
@@ -1863,7 +1863,7 @@ public class DataBaseAPI {
         } catch (final SQLException e) {
             e.printStackTrace();
 
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeConnection" + "\r\n"
+            logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.closeConnection" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage());
         }
@@ -1994,7 +1994,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_RW" + "\r\n"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_RW" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2108,7 +2108,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_WO" + "\r\n"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ScalarData_WO" + "\r\n"
                     + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2173,7 +2173,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RO_Oracle"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RO_Oracle"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2218,7 +2218,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RO_MySQL"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RO_MySQL"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2274,7 +2274,7 @@ public class DataBaseAPI {
                 setCurrentSpectrumDimX(dim_x);
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RW_MySQL"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RW_MySQL"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2328,7 +2328,7 @@ public class DataBaseAPI {
                 setCurrentSpectrumDimX(dim_x);
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RW_Oracle"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_SpectrumData_RW_Oracle"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2391,7 +2391,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_MySQL"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_MySQL"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2445,7 +2445,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_Oracle"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_Oracle"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2498,7 +2498,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RW_MySQL"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RW_MySQL"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
@@ -2571,7 +2571,7 @@ public class DataBaseAPI {
                 }
             }
         } catch (final SQLException e) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_Oracle"
+        	logger.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "DataBaseAPI.extract_ImageData_RO_Oracle"
                     + "\r\n" + "\t Reason : \t " + getDbSchema().toUpperCase().trim() + "_FAILURE" + "\r\n"
                     + "\t Description : \t " + e.getMessage() + "\r\n" + "\t Additional information : \r\n"
                     + "\t\t Statement : " + query + "\r\n");
diff --git a/src/main/java/fr/soleil/archiving/snap/api/extractor/lifecycle/DefaultLifeCycleManager.java b/src/main/java/fr/soleil/archiving/snap/api/extractor/lifecycle/DefaultLifeCycleManager.java
index 23fcf74..af120d1 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/extractor/lifecycle/DefaultLifeCycleManager.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/extractor/lifecycle/DefaultLifeCycleManager.java
@@ -43,6 +43,9 @@
 //-======================================================================
 package fr.soleil.archiving.snap.api.extractor.lifecycle;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.soleil.archiving.snap.api.extractor.convert.ConverterFactory;
 import fr.soleil.archiving.snap.api.extractor.datasources.db.ISnapReader;
 import fr.soleil.archiving.snap.api.extractor.datasources.db.SnapReaderFactory;
@@ -56,6 +59,7 @@ import fr.soleil.archiving.snap.api.extractor.naming.DynamicAttributeNamerFactor
  * @author CLAISSE
  */
 public class DefaultLifeCycleManager extends Thread implements LifeCycleManager {
+	 final static Logger logger = LoggerFactory.getLogger(DefaultLifeCycleManager.class);
     /**
      * A reference to the device that instantiated this, if the application is
      * running in device mode
@@ -69,7 +73,7 @@ public class DefaultLifeCycleManager extends Thread implements LifeCycleManager
 
     @Override
     public synchronized void applicationWillStart() {
-        System.out.println(".....INITIALIZING APPLICATION");
+    	logger.info(".....INITIALIZING APPLICATION");
 
         try {
             startFactories();
@@ -81,8 +85,7 @@ public class DefaultLifeCycleManager extends Thread implements LifeCycleManager
             this.warnWatcherFault();
         }
 
-        System.out.println(".....APPLICATION INITIALIZED");
-        System.out.println();
+        logger.info(".....APPLICATION INITIALIZED");
     }
 
     /**
@@ -98,12 +101,12 @@ public class DefaultLifeCycleManager extends Thread implements LifeCycleManager
     public synchronized void applicationWillClose() {
         try {
             // begin do stuff
-            System.out.println("Application will close !");
+            logger.info("Application will close !");
 
             snapReader = SnapReaderFactory.getCurrentImpl();
             snapReader.closeConnection();
 
-            System.out.println("Application closed");
+            logger.info("Application closed");
             // end do stuff
             System.exit(0);
         } catch (Throwable t) {
diff --git a/src/main/java/fr/soleil/archiving/snap/api/extractor/tools/Tools.java b/src/main/java/fr/soleil/archiving/snap/api/extractor/tools/Tools.java
index 30d2876..1368094 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/extractor/tools/Tools.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/extractor/tools/Tools.java
@@ -2,6 +2,9 @@ package fr.soleil.archiving.snap.api.extractor.tools;
 
 import java.sql.Timestamp;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.esrf.Tango.DevError;
 import fr.esrf.Tango.DevFailed;
 import fr.soleil.archiving.snap.api.ConfigConst;
@@ -14,6 +17,7 @@ import fr.soleil.archiving.snap.api.tools.DateUtil;
  * @author CLAISSE
  */
 public class Tools {
+	final static Logger logger = LoggerFactory.getLogger(Tools.class);
 	public static final String FR_DATE_PATTERN = "dd-MM-yyyy HH:mm:ss.SSS";
 	public static final String US_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss.SSS";
 	static final java.util.GregorianCalendar calendar = new java.util.GregorianCalendar();
@@ -72,20 +76,16 @@ public class Tools {
 
 		if (t instanceof DevFailed) {
 			if (((DevFailed) t).getCause() != null) {
-				System.out.println("CAUSE---------------START");
 				((DevFailed) t).getCause().printStackTrace();
-				System.out.println("CAUSE---------------END");
 			}
 
 			DevError[] errors = ((DevFailed) t).errors;
 			if (errors != null && errors.length != 0) {
-				System.out.println("ERRORS---------------START");
 				for (int i = 0; i < errors.length; i++) {
 					DevError error = errors[i];
-					System.out.println("desc/" + error.desc + "/origin/"
+					logger.error("desc/" + error.desc + "/origin/"
 							+ error.origin + "/reason/" + error.reason);
 				}
-				System.out.println("ERRORS---------------END");
 			}
 		}
 	}
@@ -155,9 +155,6 @@ public class Tools {
 				Timestamp ts = Timestamp.valueOf(date);
 				return ts.getTime();
 			} catch (Exception e) {
-				System.out.println("----------------------");
-				e.printStackTrace();
-				System.out.println("----------------------");
 				e.printStackTrace();
 				return -1;
 			}
diff --git a/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerApi.java b/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerApi.java
index a56ac3c..7a6c709 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerApi.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerApi.java
@@ -311,7 +311,7 @@ public class SnapManagerApi {
             }
             return false;
         } catch (final DevFailed devFailed) {
-            System.err.println("ERROR !! " + "\r\n" + "\t Origin : \t " + "SnapManagerApi.deviceLivingTest" + "\r\n"
+            LOGGER.error("ERROR !! " + "\r\n" + "\t Origin : \t " + "SnapManagerApi.deviceLivingTest" + "\r\n"
                     + "\t Reason : \t " + "SNAP_FAILURE" + "\r\n" + "\t Description : \t " + devFailed.getMessage()
                     + "\r\n" + "\t Additional information : \t " + "The device " + deviceName + " does not answer..."
                     + "\r\n");
diff --git a/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerImpl.java b/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerImpl.java
index fffa59f..6df0640 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerImpl.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/manager/SnapManagerImpl.java
@@ -67,6 +67,8 @@ package fr.soleil.archiving.snap.api.manager;
 
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.tango.utils.DevFailedUtils;
 
 import fr.esrf.Tango.DevFailed;
@@ -88,6 +90,7 @@ import fr.soleil.archiving.snap.api.tools.SnapshotingException;
  *         Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
  */
 public class SnapManagerImpl implements ISnapManager {
+	final static Logger logger = LoggerFactory.getLogger(SnapManagerImpl.class);
 
 
     public SnapManagerImpl() {
@@ -151,7 +154,7 @@ public class SnapManagerImpl implements ISnapManager {
                 snapEx.initCause(dFEx);
 
             } catch (final IllegalStateException e) {
-                System.out.println("CLA/Failed during initCause!");
+                logger.error("CLA/Failed during initCause!");
                 e.printStackTrace();
                 // do nothing
             }
diff --git a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
index 509e37e..4c7818e 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dao/ClasspathDAOBeansLoader.java
@@ -25,6 +25,10 @@
 package fr.soleil.archiving.snap.api.persistence.spring.dao;
 
 import org.apache.commons.dbcp.BasicDataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.ext.XLogger;
+import org.slf4j.ext.XLoggerFactory;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.ClassPathResource;
@@ -39,6 +43,7 @@ import fr.soleil.archiving.snap.api.persistence.spring.dto.Sp1Val;
 import fr.soleil.archiving.snap.api.persistence.spring.dto.Sp2Val;
 
 public class ClasspathDAOBeansLoader implements DAOBeansLoader {
+	final static XLogger logger = XLoggerFactory.getXLogger(ClasspathDAOBeansLoader.class);
     private static final String DEFAULT_BEANS_FILE_NAME = "beans.xml";
     private final String resourceName;
 
@@ -52,49 +57,37 @@ public class ClasspathDAOBeansLoader implements DAOBeansLoader {
     private ValDAO<Im2Val> im2ValDAO;
 
     public ClasspathDAOBeansLoader(String _resourceName, String userName, String password) {
-	boolean defaultResource = _resourceName == null || _resourceName.trim().length() == 0;
-	this.resourceName = defaultResource ? DEFAULT_BEANS_FILE_NAME : _resourceName;
-	System.out.println("----- Hibernate Resources -----");
-	System.out.println("configure hibernate resource: " + resourceName);
-	// AbstractApplicationContext ctx = new
-	// ClassPathXmlApplicationContext(this.resourceName);
-	BeanFactory factory = new XmlBeanFactory(new ClassPathResource(this.resourceName));
-	// AbstractApplicationContext ctx = new FileSystemXmlApplicationContext
-	// ( this.resourceName );
-	if (factory.getBean("dataSource") instanceof BasicDataSource) {
-	    BasicDataSource datasource = (BasicDataSource) factory.getBean("dataSource");
-	    System.out.println("Hibernate dataSource url: " + datasource.getUrl());
-	    System.out.println("configure dataSource userName from device: " + userName);
-	    System.out.println("configure dataSource password from device: " + password);
-	    datasource.setUsername(userName);
-	    datasource.setPassword(password);
-	}
-	System.out.println("--------------------------------");
-	// factory.
-	// AbstractApplicationContext ctx = new
-	// ClassPathXmlApplicationContext(this.resourceName);
-	// factory.registerShutdownHook();// Shuts down the
-	// Spring IoC
-	// container
-	// gracefully in
-	// non-web
-	// applications
-	this.instantiateBeans(factory);
-	System.out.println("ClasspathDAOBeansLoader out");
+    	logger.entry(_resourceName,userName,password);
+		boolean defaultResource = _resourceName == null || _resourceName.trim().length() == 0;
+		this.resourceName = defaultResource ? DEFAULT_BEANS_FILE_NAME : _resourceName;
+		logger.info("configure hibernate resource: " + resourceName);
+
+		BeanFactory factory = new XmlBeanFactory(new ClassPathResource(this.resourceName));
+
+		if (factory.getBean("dataSource") instanceof BasicDataSource) {
+		    BasicDataSource datasource = (BasicDataSource) factory.getBean("dataSource");
+		    logger.info("Hibernate dataSource url: " + datasource.getUrl());
+		    logger.info("configure dataSource userName from device: " + userName);
+		    logger.info("configure dataSource password from device: " + password);
+		    datasource.setUsername(userName);
+		    datasource.setPassword(password);
+		}
+		this.instantiateBeans(factory);
+		logger.exit();
     }
 
     @SuppressWarnings("unchecked")
     private void instantiateBeans(BeanFactory ctx) {
-	System.out.println("instantiateBeans in");
-	scNum1ValDAO = (ValDAO<ScNum1Val>) ctx.getBean("scNum1ValDAO");
-	scNum2ValDAO = (ValDAO<ScNum2Val>) ctx.getBean("scNum2ValDAO");
-	scStr1ValDAO = (ValDAO<ScStr1Val>) ctx.getBean("scStr1ValDAO");
-	scStr2ValDAO = (ValDAO<ScStr2Val>) ctx.getBean("scStr2ValDAO");
-	sp1ValDAO = (ValDAO<Sp1Val>) ctx.getBean("sp1ValDAO");
-	sp2ValDAO = (ValDAO<Sp2Val>) ctx.getBean("sp2ValDAO");
-	im1ValDAO = (ValDAO<Im1Val>) ctx.getBean("im1ValDAO");
-	im2ValDAO = (ValDAO<Im2Val>) ctx.getBean("im2ValDAO");
-	System.out.println("instantiateBeans out");
+    	logger.entry(ctx);
+		scNum1ValDAO = (ValDAO<ScNum1Val>) ctx.getBean("scNum1ValDAO");
+		scNum2ValDAO = (ValDAO<ScNum2Val>) ctx.getBean("scNum2ValDAO");
+		scStr1ValDAO = (ValDAO<ScStr1Val>) ctx.getBean("scStr1ValDAO");
+		scStr2ValDAO = (ValDAO<ScStr2Val>) ctx.getBean("scStr2ValDAO");
+		sp1ValDAO = (ValDAO<Sp1Val>) ctx.getBean("sp1ValDAO");
+		sp2ValDAO = (ValDAO<Sp2Val>) ctx.getBean("sp2ValDAO");
+		im1ValDAO = (ValDAO<Im1Val>) ctx.getBean("im1ValDAO");
+		im2ValDAO = (ValDAO<Im2Val>) ctx.getBean("im2ValDAO");
+		logger.exit();
     }
 
     /**
diff --git a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/CompositeId.java b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/CompositeId.java
index 425c3a1..98a5754 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/CompositeId.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/CompositeId.java
@@ -26,9 +26,14 @@ package fr.soleil.archiving.snap.api.persistence.spring.dto;
 
 import java.io.Serializable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class CompositeId implements Serializable {
 
     private static final long serialVersionUID = -7083548602060429550L;
+    
+    final static Logger logger = LoggerFactory.getLogger(CompositeId.class);
 
     private int idSnap;
     private int idAtt;
@@ -98,7 +103,7 @@ public class CompositeId implements Serializable {
     }
 
     public void trace() {
-        System.out.println(this + "/idSnap/" + idSnap + "/idAtt/" + idAtt);
+    	logger.debug(this + "/idSnap/" + idSnap + "/idAtt/" + idAtt);
     }
 
     @Override
diff --git a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum2Val.java b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum2Val.java
index 1d73b8c..977f93d 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum2Val.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/persistence/spring/dto/ScNum2Val.java
@@ -24,10 +24,14 @@
  */
 package fr.soleil.archiving.snap.api.persistence.spring.dto;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import fr.soleil.actiongroup.collectiveaction.onattributes.plugin.persistance.AnyAttribute;
 import fr.soleil.archiving.snap.api.persistence.context.SnapshotPersistenceContext;
 
 public class ScNum2Val extends Val {
+	 final static Logger logger = LoggerFactory.getLogger(ScNum2Val.class);
 	private double readValue;
 	private double writeValue;
 
@@ -74,12 +78,8 @@ public class ScNum2Val extends Val {
 	}
 
 	public void trace() {
-		System.out.println();
-		System.out.println("ScNum2Val/trace VVVVVVVVVVVVVVV");
 		super.getCompositeId().trace();
-		System.out.println("ScNum2Val/readValue/" + readValue);
-		System.out.println("ScNum2Val/writeValue/" + writeValue);
-		System.out.println("ScNum2Val/trace ^^^^^^^^^^^^^^");
-		System.out.println();
+		logger.debug("ScNum2Val/readValue/" + readValue);
+		logger.debug("ScNum2Val/writeValue/" + writeValue);
 	}
 }
diff --git a/src/main/java/fr/soleil/archiving/snap/api/tools/SnapshotingException.java b/src/main/java/fr/soleil/archiving/snap/api/tools/SnapshotingException.java
index bc354f4..8f119f5 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/tools/SnapshotingException.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/tools/SnapshotingException.java
@@ -290,18 +290,8 @@ public class SnapshotingException extends Exception {
             if (errs != null) {
                 for (int i = 0; i < errs.length; i++) {
                     DevError nextErr = errs[i];
-                    /*
-                     * String desc = nextErr.desc; String origin =
-                     * nextErr.origin;
-                     */
                     String reason = nextErr.reason;
 
-                    /*
-                     * System.out.println("CLA/DevFailed/desc/"+desc+"/");
-                     * System.out.println("CLA/DevFailed/origin/"+origin+"/");
-                     * System.out.println("CLA/DevFailed/reason/"+reason+"/");
-                     */
-
                     if (reason.indexOf(TIMEOUT) != -1) {
                         this.setDueToATimeOut(true);
                         return true;
diff --git a/src/main/java/fr/soleil/archiving/snap/api/tools/StringFormater.java b/src/main/java/fr/soleil/archiving/snap/api/tools/StringFormater.java
index 01d28ae..cd4b6ef 100644
--- a/src/main/java/fr/soleil/archiving/snap/api/tools/StringFormater.java
+++ b/src/main/java/fr/soleil/archiving/snap/api/tools/StringFormater.java
@@ -18,8 +18,12 @@
  */
 package fr.soleil.archiving.snap.api.tools;
 
-public class StringFormater {
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+public class StringFormater {
+	final static Logger logger = LoggerFactory.getLogger(StringFormater.class);
+	 
     // Special characters
     private final static String[] protect = { "[", "]", ",", ";", "'", "\"", "~", "\n" };
 
@@ -58,9 +62,9 @@ public class StringFormater {
         String toto1 = "toto \n toto";
         String toto2 = formatStringToWrite(toto1);
         String toto3 = formatStringToRead(toto2);
-        System.out.println("toto1 = |" + toto1 + "|");
-        System.out.println("toto2 = |" + toto2 + "|");
-        System.out.println("toto3 = |" + toto3 + "|");
+        logger.debug("toto1 = |" + toto1 + "|");
+        logger.debug("toto2 = |" + toto2 + "|");
+        logger.debug("toto3 = |" + toto3 + "|");
     }
 
 }
-- 
GitLab