IDEMPIERE-638 Fix replacing Logger with CLogger
This commit is contained in:
parent
61608cd26d
commit
e7f817ec2b
|
@ -22,7 +22,6 @@ import java.security.KeyStore.PasswordProtection;
|
||||||
import java.security.KeyStore.SecretKeyEntry;
|
import java.security.KeyStore.SecretKeyEntry;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.crypto.KeyGenerator;
|
import javax.crypto.KeyGenerator;
|
||||||
import javax.crypto.SecretKey;
|
import javax.crypto.SecretKey;
|
||||||
|
@ -43,7 +42,7 @@ public class DefaultKeyStore implements IKeyStore {
|
||||||
private static final String IDEMPIERE_KEYSTORE = "idempiere.ks";
|
private static final String IDEMPIERE_KEYSTORE = "idempiere.ks";
|
||||||
|
|
||||||
/** Logger */
|
/** Logger */
|
||||||
private static Logger log = Logger.getLogger (DefaultKeyStore.class.getName());
|
private static CLogger log = CLogger.getCLogger (DefaultKeyStore.class.getName());
|
||||||
|
|
||||||
/** Adempiere Key */
|
/** Adempiere Key */
|
||||||
private SecretKey m_key = null;
|
private SecretKey m_key = null;
|
||||||
|
|
|
@ -25,7 +25,6 @@ import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import javax.print.attribute.standard.MediaSize;
|
import javax.print.attribute.standard.MediaSize;
|
||||||
|
|
||||||
|
@ -73,7 +72,7 @@ public class Language implements Serializable
|
||||||
private static Language s_baseLanguage = s_languages[0];
|
private static Language s_baseLanguage = s_languages[0];
|
||||||
|
|
||||||
/** Logger */
|
/** Logger */
|
||||||
private static Logger log = Logger.getLogger(Language.class.getName());
|
private static CLogger log = CLogger.getCLogger(Language.class.getName());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get Number of Languages
|
* Get Number of Languages
|
||||||
|
|
|
@ -136,7 +136,7 @@ public class Secure implements SecureInterface
|
||||||
|
|
||||||
private IKeyStore m_keyStore = null;
|
private IKeyStore m_keyStore = null;
|
||||||
/** Logger */
|
/** Logger */
|
||||||
private static Logger log = Logger.getLogger (Secure.class.getName());
|
private static CLogger log = CLogger.getCLogger (Secure.class.getName());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize Cipher & Key
|
* Initialize Cipher & Key
|
||||||
|
|
|
@ -227,7 +227,7 @@ public class SecureEngine
|
||||||
/** The real Engine */
|
/** The real Engine */
|
||||||
private SecureInterface implementation = null;
|
private SecureInterface implementation = null;
|
||||||
/** Logger */
|
/** Logger */
|
||||||
private static Logger log = Logger.getLogger (SecureEngine.class.getName());
|
private static CLogger log = CLogger.getCLogger (SecureEngine.class.getName());
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -18,7 +18,7 @@ public class StoredHtmlSrc extends MultiPartElement implements Printable {
|
||||||
private static final long serialVersionUID = 50303119083373138L;
|
private static final long serialVersionUID = 50303119083373138L;
|
||||||
|
|
||||||
/** Logger */
|
/** Logger */
|
||||||
protected static Logger log = Logger.getLogger(StoredHtmlSrc.class.getName());
|
protected static CLogger log = CLogger.getCLogger(StoredHtmlSrc.class.getName());
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -45,7 +45,7 @@ import javax.swing.KeyStroke;
|
||||||
public class Util
|
public class Util
|
||||||
{
|
{
|
||||||
/** Logger */
|
/** Logger */
|
||||||
private static Logger log = Logger.getLogger(Util.class.getName());
|
private static CLogger log = CLogger.getCLogger(Util.class.getName());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace String values.
|
* Replace String values.
|
||||||
|
|
|
@ -3,20 +3,20 @@ package org.adempiere.pipo.srv;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import org.adempiere.base.IDictionaryService;
|
import org.adempiere.base.IDictionaryService;
|
||||||
import org.adempiere.pipo2.PackIn;
|
import org.adempiere.pipo2.PackIn;
|
||||||
import org.adempiere.pipo2.Zipper;
|
import org.adempiere.pipo2.Zipper;
|
||||||
import org.compiere.Adempiere;
|
import org.compiere.Adempiere;
|
||||||
import org.compiere.model.X_AD_Package_Imp_Proc;
|
import org.compiere.model.X_AD_Package_Imp_Proc;
|
||||||
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Trx;
|
import org.compiere.util.Trx;
|
||||||
import org.osgi.framework.BundleContext;
|
import org.osgi.framework.BundleContext;
|
||||||
|
|
||||||
public class PipoDictionaryService implements IDictionaryService {
|
public class PipoDictionaryService implements IDictionaryService {
|
||||||
|
|
||||||
Logger logger = Logger.getLogger(PipoDictionaryService.class.getName());
|
CLogger logger = CLogger.getCLogger(PipoDictionaryService.class.getName());
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void merge(BundleContext context, File packageFile) throws Exception {
|
public void merge(BundleContext context, File packageFile) throws Exception {
|
||||||
|
|
|
@ -6,24 +6,24 @@ import java.io.InputStream;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import org.adempiere.base.IDictionaryService;
|
import org.adempiere.base.IDictionaryService;
|
||||||
import org.adempiere.util.ServerContext;
|
import org.adempiere.util.ServerContext;
|
||||||
import org.compiere.Adempiere;
|
import org.compiere.Adempiere;
|
||||||
import org.compiere.model.Query;
|
import org.compiere.model.Query;
|
||||||
import org.compiere.model.X_AD_Package_Imp;
|
import org.compiere.model.X_AD_Package_Imp;
|
||||||
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Trx;
|
import org.compiere.util.Trx;
|
||||||
import org.osgi.framework.BundleActivator;
|
import org.osgi.framework.BundleActivator;
|
||||||
import org.osgi.framework.BundleContext;
|
import org.osgi.framework.BundleContext;
|
||||||
import org.osgi.framework.ServiceReference;
|
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> {
|
public class AdempiereActivator implements BundleActivator, ServiceTrackerCustomizer<IDictionaryService, IDictionaryService> {
|
||||||
|
|
||||||
protected final static Logger logger = Logger
|
protected final static CLogger logger = CLogger.getCLogger(AdempiereActivator.class.getName());
|
||||||
.getLogger(AdempiereActivator.class.getName());
|
|
||||||
private BundleContext context;
|
private BundleContext context;
|
||||||
private ServiceTracker<IDictionaryService, IDictionaryService> serviceTracker;
|
private ServiceTracker<IDictionaryService, IDictionaryService> serviceTracker;
|
||||||
private IDictionaryService service;
|
private IDictionaryService service;
|
||||||
|
|
|
@ -15,11 +15,11 @@ package org.adempiere.webui.util;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.logging.Logger;
|
|
||||||
|
|
||||||
import org.compiere.model.I_AD_Preference;
|
import org.compiere.model.I_AD_Preference;
|
||||||
import org.compiere.model.MPreference;
|
import org.compiere.model.MPreference;
|
||||||
import org.compiere.model.Query;
|
import org.compiere.model.Query;
|
||||||
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
import org.compiere.util.Language;
|
import org.compiere.util.Language;
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@ public final class UserPreference implements Serializable {
|
||||||
|
|
||||||
/** Logger */
|
/** Logger */
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
private static Logger log = Logger.getLogger(UserPreference.class.getName());
|
private static CLogger log = CLogger.getCLogger(UserPreference.class.getName());
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* save user preference
|
* save user preference
|
||||||
|
|
Loading…
Reference in New Issue