diff --git a/org.adempiere.base/src/org/compiere/util/DefaultKeyStore.java b/org.adempiere.base/src/org/compiere/util/DefaultKeyStore.java
index 9d849db6f9..2161f2216e 100644
--- a/org.adempiere.base/src/org/compiere/util/DefaultKeyStore.java
+++ b/org.adempiere.base/src/org/compiere/util/DefaultKeyStore.java
@@ -22,7 +22,6 @@ import java.security.KeyStore.PasswordProtection;
 import java.security.KeyStore.SecretKeyEntry;
 import java.util.Properties;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
@@ -43,7 +42,7 @@ public class DefaultKeyStore implements IKeyStore {
 	private static final String IDEMPIERE_KEYSTORE = "idempiere.ks";
 
 	/**	Logger						*/
-	private static Logger	log	= Logger.getLogger (DefaultKeyStore.class.getName());
+	private static CLogger	log	= CLogger.getCLogger (DefaultKeyStore.class.getName());
 	
 	/** Adempiere Key				*/
 	private SecretKey m_key = null;
diff --git a/org.adempiere.base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java
index 60f40c6e1d..123c0e5c0a 100644
--- a/org.adempiere.base/src/org/compiere/util/Language.java
+++ b/org.adempiere.base/src/org/compiere/util/Language.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.print.attribute.standard.MediaSize;
 
@@ -73,7 +72,7 @@ public class Language implements Serializable
 	private static Language     s_baseLanguage = s_languages[0];
 
 	/**	Logger			*/
-	private static Logger log = Logger.getLogger(Language.class.getName());
+	private static CLogger log = CLogger.getCLogger(Language.class.getName());
 	
 	/**
 	 *  Get Number of Languages
diff --git a/org.adempiere.base/src/org/compiere/util/Secure.java b/org.adempiere.base/src/org/compiere/util/Secure.java
index e55ade8063..5dc21d2720 100644
--- a/org.adempiere.base/src/org/compiere/util/Secure.java
+++ b/org.adempiere.base/src/org/compiere/util/Secure.java
@@ -136,7 +136,7 @@ public class Secure implements SecureInterface
 
 	private IKeyStore m_keyStore = null;
 	/**	Logger						*/
-	private static Logger	log	= Logger.getLogger (Secure.class.getName());
+	private static CLogger	log	= CLogger.getCLogger (Secure.class.getName());
 
 	/**
 	 * 	Initialize Cipher & Key
diff --git a/org.adempiere.base/src/org/compiere/util/SecureEngine.java b/org.adempiere.base/src/org/compiere/util/SecureEngine.java
index b179b8c10c..dcebdb5c67 100644
--- a/org.adempiere.base/src/org/compiere/util/SecureEngine.java
+++ b/org.adempiere.base/src/org/compiere/util/SecureEngine.java
@@ -227,7 +227,7 @@ public class SecureEngine
 	/** The real Engine				*/
 	private	SecureInterface		implementation = null;
 	/**	Logger						*/
-	private static Logger		log	= Logger.getLogger (SecureEngine.class.getName());
+	private static CLogger		log	= CLogger.getCLogger (SecureEngine.class.getName());
 	
 	
 	/**
diff --git a/org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java b/org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java
index 1c93ac6215..a19bbcdfef 100644
--- a/org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java
+++ b/org.adempiere.base/src/org/compiere/util/StoredHtmlSrc.java
@@ -18,7 +18,7 @@ public class StoredHtmlSrc extends MultiPartElement implements Printable {
 	private static final long serialVersionUID = 50303119083373138L;
 	
 	/**	Logger					*/
-	protected static Logger 	log = Logger.getLogger(StoredHtmlSrc.class.getName());
+	protected static CLogger 	log = CLogger.getCLogger(StoredHtmlSrc.class.getName());
 	
 	
 	/**
diff --git a/org.adempiere.base/src/org/compiere/util/Util.java b/org.adempiere.base/src/org/compiere/util/Util.java
index d93cc30c49..04e5fe6f39 100644
--- a/org.adempiere.base/src/org/compiere/util/Util.java
+++ b/org.adempiere.base/src/org/compiere/util/Util.java
@@ -45,7 +45,7 @@ import javax.swing.KeyStroke;
 public class Util
 {
 	/**	Logger			*/
-	private static Logger log = Logger.getLogger(Util.class.getName());
+	private static CLogger log = CLogger.getCLogger(Util.class.getName());
 
 	/**
 	 *	Replace String values.
diff --git a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
index eb21a799ba..d93d58fe1b 100644
--- a/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
+++ b/org.adempiere.pipo/src/org/adempiere/pipo/srv/PipoDictionaryService.java
@@ -3,20 +3,20 @@ package org.adempiere.pipo.srv;
 import java.io.File;
 import java.sql.Timestamp;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.adempiere.base.IDictionaryService;
 import org.adempiere.pipo2.PackIn;
 import org.adempiere.pipo2.Zipper;
 import org.compiere.Adempiere;
 import org.compiere.model.X_AD_Package_Imp_Proc;
+import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Trx;
 import org.osgi.framework.BundleContext;
 
 public class PipoDictionaryService implements IDictionaryService {
 
-	Logger logger = Logger.getLogger(PipoDictionaryService.class.getName());
+	CLogger logger = CLogger.getCLogger(PipoDictionaryService.class.getName());
 
 	@Override
 	public void merge(BundleContext context, File packageFile) throws Exception {
diff --git a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java
index c4bff5f168..f847a30cf4 100644
--- a/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java
+++ b/org.adempiere.plugin.utils/src/org/adempiere/plugin/utils/AdempiereActivator.java
@@ -6,24 +6,24 @@ import java.io.InputStream;
 import java.net.URL;
 import java.util.Properties;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.adempiere.base.IDictionaryService;
 import org.adempiere.util.ServerContext;
 import org.compiere.Adempiere;
 import org.compiere.model.Query;
 import org.compiere.model.X_AD_Package_Imp;
+import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Trx;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.*;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
 public class AdempiereActivator implements BundleActivator, ServiceTrackerCustomizer<IDictionaryService, IDictionaryService> {
 
-	protected final static Logger logger = Logger
-			.getLogger(AdempiereActivator.class.getName());
+	protected final static CLogger logger = CLogger.getCLogger(AdempiereActivator.class.getName());
 	private BundleContext context;
 	private ServiceTracker<IDictionaryService, IDictionaryService> serviceTracker;
 	private IDictionaryService service;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
index 92a1c10388..a45ac992fe 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/UserPreference.java
@@ -15,11 +15,11 @@ package org.adempiere.webui.util;
 
 import java.io.Serializable;
 import java.util.Properties;
-import java.util.logging.Logger;
 
 import org.compiere.model.I_AD_Preference;
 import org.compiere.model.MPreference;
 import org.compiere.model.Query;
+import org.compiere.util.CLogger;
 import org.compiere.util.Env;
 import org.compiere.util.Language;
 
@@ -98,7 +98,7 @@ public final class UserPreference implements Serializable {
 
 	/** Logger */
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(UserPreference.class.getName());
+	private static CLogger log = CLogger.getCLogger(UserPreference.class.getName());
 
 	/**
 	 * save user preference