Changeset 6444


Ignore:
Timestamp:
Apr 9, 2014, 2:21:20 PM (8 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1801: Switch to slf4j

Location:
trunk
Files:
92 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/dist/log4j.properties

    r6330 r6444  
    3131
    3232### Log Internal Job queue events
    33 #log4j.logger.net.sf.basedb.core.jobqueue=debug
     33#log4j.logger.net.sf.basedb.core.InternalJobQueue=debug
    3434
    3535### Log Internal Secondary storage controller
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/Agent.java

    r6424 r6444  
    241241    Log job agent events.
    242242  */
    243   private static final org.apache.log4j.Logger log =
    244     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.Agent");
     243  private static final org.slf4j.Logger log =
     244    org.slf4j.LoggerFactory.getLogger(Agent.class);
    245245
    246246  /**
    247247    Log job agent server events.
    248248  */
    249   private static final org.apache.log4j.Logger logServer =
    250     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.JobAgentServerConnection");
     249  private static final org.slf4j.Logger logServer =
     250    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.clients.jobagent.JobAgentServerConnection");
    251251 
    252252  private final Properties properties;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/AgentController.java

    r5446 r6444  
    5454    Log job agent events.
    5555  */
    56   private static final org.apache.log4j.Logger log =
    57     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.AgentController");
     56  private static final org.slf4j.Logger log =
     57    org.slf4j.LoggerFactory.getLogger(AgentController.class);
    5858
    5959  public static void main(String[] args)
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/JobQueueChecker.java

    r6127 r6444  
    5252    Log job agent events.
    5353  */
    54   private static final org.apache.log4j.Logger log =
    55     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.JobQueueChecker");
     54  private static final org.slf4j.Logger log =
     55    org.slf4j.LoggerFactory.getLogger(JobQueueChecker.class);
    5656 
    5757  private final Agent agent;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/JobRunner.java

    r6127 r6444  
    5050    Log job agent events.
    5151  */
    52   private static final org.apache.log4j.Logger log =
    53     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.JobRunner");
     52  private static final org.slf4j.Logger log =
     53    org.slf4j.LoggerFactory.getLogger(JobRunner.class);
    5454
    5555  private final Job job;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/DummyJobExecutor.java

    r6127 r6444  
    6969    Log job agent events.
    7070  */
    71   private static final org.apache.log4j.Logger log =
    72     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.executors.DummyJobExecutor");
     71  private static final org.slf4j.Logger log =
     72    org.slf4j.LoggerFactory.getLogger(DummyJobExecutor.class);
    7373 
    7474 
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ProcessJobExecutor.java

    r6127 r6444  
    9999    Log job agent events.
    100100  */
    101   private static final org.apache.log4j.Logger log =
    102     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.executors.ProcessJobExecutor");
     101  private static final org.slf4j.Logger log =
     102    org.slf4j.LoggerFactory.getLogger(ProcessJobExecutor.class);
    103103 
    104104 
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/executors/ThreadJobExecutor.java

    r6424 r6444  
    6363    Log job agent events.
    6464  */
    65   private static final org.apache.log4j.Logger log =
    66     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.executors.ThreadJobExecutor");
     65  private static final org.slf4j.Logger log =
     66    org.slf4j.LoggerFactory.getLogger(ThreadJobExecutor.class);
    6767 
    6868  private SignalReceiver signalReceiver;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/handlers/DefaultRequestHandler.java

    r5446 r6444  
    5252    Log job agent events.
    5353  */
    54   private static final org.apache.log4j.Logger log =
    55     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.DefaultRequestHandler");
     54  private static final org.slf4j.Logger log =
     55    org.slf4j.LoggerFactory.getLogger(DefaultRequestHandler.class);
    5656 
    5757  private final Agent agent;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/handlers/InfoRequestHandler.java

    r6127 r6444  
    4747  private static boolean useJavaSysMon = true;
    4848 
    49   private static final org.apache.log4j.Logger log =
    50     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.InfoRequestHandler");
     49  private static final org.slf4j.Logger log =
     50    org.slf4j.LoggerFactory.getLogger(InfoRequestHandler.class);
    5151 
    5252  private final Agent agent;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/handlers/MultiProtocolRequestHandler.java

    r5823 r6444  
    5252    Logger.
    5353  */
    54   private static final org.apache.log4j.Logger log =
    55     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.MultiProtocolRequestHandler");
     54  private static final org.slf4j.Logger log =
     55    org.slf4j.LoggerFactory.getLogger(MultiProtocolRequestHandler.class);
    5656
    5757  private final Agent agent;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/slotmanager/InternalSlotManager.java

    r5823 r6444  
    4747{
    4848
    49   private static final org.apache.log4j.Logger log =
    50     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.slotmanager.InternalSlotManager");
     49  private static final org.slf4j.Logger log =
     50    org.slf4j.LoggerFactory.getLogger(InternalSlotManager.class);
    5151
    5252  private Agent agent;
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/slotmanager/MasterSlotManager.java

    r5823 r6444  
    7373{
    7474
    75   private static final org.apache.log4j.Logger log =
    76     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.slotmanager.MasterSlotManager");
     75  private static final org.slf4j.Logger log =
     76    org.slf4j.LoggerFactory.getLogger(MasterSlotManager.class);
    7777
    7878 
  • trunk/src/clients/jobagent/net/sf/basedb/clients/jobagent/slotmanager/RemoteSlotManager.java

    r5447 r6444  
    6262{
    6363
    64   private static final org.apache.log4j.Logger log =
    65     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.jobagent.slotmanager.RemoteSlotManager");
     64  private static final org.slf4j.Logger log =
     65    org.slf4j.LoggerFactory.getLogger(RemoteSlotManager.class);
    6666
    6767  private Agent agent;
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

    r6408 r6444  
    9898{
    9999
    100   private static final org.apache.log4j.Logger log =
    101     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.ExtensionsControl");
     100  private static final org.slf4j.Logger log =
     101    org.slf4j.LoggerFactory.getLogger(ExtensionsControl.class);
    102102 
    103103  /**
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/LoadServletsProcessor.java

    r6379 r6444  
    4949{
    5050
    51   private static final org.apache.log4j.Logger log =
    52     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.LoadServletsProcessor");
     51  private static final org.slf4j.Logger log =
     52    org.slf4j.LoggerFactory.getLogger(LoadServletsProcessor.class);
    5353
    5454  private final ServletContext context;
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/Services.java

    r6440 r6444  
    4141{
    4242
    43   private static final org.apache.log4j.Logger log =
    44     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.service.Services");
     43  private static final org.slf4j.Logger log =
     44    org.slf4j.LoggerFactory.getLogger(Services.class);
    4545
    4646  public static final String EXTENSION_POINT_ID = "net.sf.basedb.clients.web.services";
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/ServicesEventHandler.java

    r5606 r6444  
    4242{
    4343
    44   private static final org.apache.log4j.Logger log =
    45     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.service.ServicesEventHandler");
     44  private static final org.slf4j.Logger log =
     45    org.slf4j.LoggerFactory.getLogger(ServicesEventHandler.class);
    4646
    4747  private final Settings settings;
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/StartServiceRenderer.java

    r5218 r6444  
    3535  implements Renderer<ServiceControllerAction>
    3636{
    37   private static final org.apache.log4j.Logger log =
    38     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.service.StartServiceRenderer");
     37  private static final org.slf4j.Logger log =
     38    org.slf4j.LoggerFactory.getLogger(StartServiceRenderer.class);
    3939
    4040  public StartServiceRenderer()
  • trunk/src/clients/web/net/sf/basedb/clients/web/extensions/service/StopServiceRenderer.java

    r5218 r6444  
    3636{
    3737
    38   private static final org.apache.log4j.Logger log =
    39     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.extensions.service.StopServiceRenderer");
     38  private static final org.slf4j.Logger log =
     39    org.slf4j.LoggerFactory.getLogger(StopServiceRenderer.class);
    4040
    4141  public StopServiceRenderer()
  • trunk/src/clients/web/net/sf/basedb/clients/web/fileupload/FileUpload.java

    r6127 r6444  
    5656    Debug file upload.
    5757  */
    58   private static final org.apache.log4j.Logger log =
    59     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.fileupload.FileUpload");
     58  private static final org.slf4j.Logger log =
     59    org.slf4j.LoggerFactory.getLogger(FileUpload.class);
    6060
    6161  /**
  • trunk/src/clients/web/net/sf/basedb/clients/web/servlet/ContentSecurityPolicyReportServlet.java

    r6406 r6444  
    4949  private static final int MAX_REPORT_LENGTH = 1024;
    5050
    51   private static final org.apache.log4j.Logger log =
    52     org.apache.log4j.LogManager.getLogger("net.sf.basedb.clients.web.servlet.ContentSecurityPolicyReportServlet");
     51  private static final org.slf4j.Logger log =
     52    org.slf4j.LoggerFactory.getLogger(ContentSecurityPolicyReportServlet.class);
    5353 
    5454  @Override
  • trunk/src/clients/web/net/sf/basedb/clients/web/util/SimpleSignalProgressReporter.java

    r6127 r6444  
    4949    Log signals processing.
    5050  */
    51   private static final org.apache.log4j.Logger logger =
    52     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.SimpleSignalProgressReporter");
     51  private static final org.slf4j.Logger logger =
     52    org.slf4j.LoggerFactory.getLogger(SimpleSignalProgressReporter.class);
    5353 
    5454  private SignalHandler handler = null;
  • trunk/src/core/net/sf/basedb/core/AbstractBatcher.java

    r6127 r6444  
    4949    Log all SQL statements.
    5050  */
    51   protected static final org.apache.log4j.Logger logSql =
    52     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.sql");
     51  protected static final org.slf4j.Logger logSql =
     52    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.sql");
    5353 
    5454  /**
  • trunk/src/core/net/sf/basedb/core/AbstractEntityQuery.java

    r6022 r6444  
    5555    Log all parameter bindings to prepared statement.
    5656  */
    57   private static final org.apache.log4j.Logger logParam =
    58     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.bind.AbstractEntityQuery");
     57  private static final org.slf4j.Logger logParam =
     58    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.bind.AbstractEntityQuery");
    5959   
    6060  /**
  • trunk/src/core/net/sf/basedb/core/AbstractHqlQuery.java

    r5564 r6444  
    6161    Log all parameter bindings to prepared statement.
    6262  */
    63   private static final org.apache.log4j.Logger logParam =
    64     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.bind.AbstractHqlQuery");
     63  private static final org.slf4j.Logger logParam =
     64    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.bind.AbstractHqlQuery");
    6565   
    6666  /**
  • trunk/src/core/net/sf/basedb/core/AbstractQuery.java

    r6127 r6444  
    6464    Log all SQL statements.
    6565  */
    66   private static final org.apache.log4j.Logger logSql =
    67     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.ql.AbstractQuery");
     66  private static final org.slf4j.Logger logSql =
     67    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.ql.AbstractQuery");
    6868
    6969  /**
  • trunk/src/core/net/sf/basedb/core/AbstractSqlQuery.java

    r6127 r6444  
    5959    Log all SQL statements.
    6060  */
    61   private static final org.apache.log4j.Logger logSql =
    62     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.ql");
     61  private static final org.slf4j.Logger logSql =
     62    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.ql");
    6363
    6464  /**
     
    7070    Log all parameter bindings to prepared statement.
    7171  */
    72   private static final org.apache.log4j.Logger logParam =
    73     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.bind");
     72  private static final org.slf4j.Logger logParam =
     73    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.bind");
    7474 
    7575  /**
  • trunk/src/core/net/sf/basedb/core/AnnotationRestriction.java

    r6127 r6444  
    5353    Log all SQL statements.
    5454  */
    55   private static final org.apache.log4j.Logger logSql =
    56     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.ql");
     55  private static final org.slf4j.Logger logSql =
     56    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.query.ql");
    5757 
    5858  /**
  • trunk/src/core/net/sf/basedb/core/Application.java

    r6423 r6444  
    7979    Log core events.
    8080  */
    81   private static final org.apache.log4j.Logger log =
    82     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.Application");
     81  private static final org.slf4j.Logger log =
     82    org.slf4j.LoggerFactory.getLogger(Application.class);
    8383
    8484  /**
     
    291291    Get the BASE core logger.
    292292  */
    293   static org.apache.log4j.Logger getLogger()
     293  static org.slf4j.Logger getLogger()
    294294  {
    295295    return log;
  • trunk/src/core/net/sf/basedb/core/BasicBatcher.java

    r6127 r6444  
    6262    Log all parameter bindings to prepared statement.
    6363  */
    64   protected static final org.apache.log4j.Logger logParam =
    65     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.bind.BasicBatcher");
     64  protected static final org.slf4j.Logger logParam =
     65    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.bind.BasicBatcher");
    6666
    6767  /**
  • trunk/src/core/net/sf/basedb/core/BatchUtil.java

    r4889 r6444  
    5050    Log all SQL statements.
    5151  */
    52   private static final org.apache.log4j.Logger logSql =
    53     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.sql");
     52  private static final org.slf4j.Logger logSql =
     53    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.sql");
    5454
    5555  /**
  • trunk/src/core/net/sf/basedb/core/DbControl.java

    r6357 r6444  
    6767    Log core events.
    6868  */
    69   private static final org.apache.log4j.Logger log =
    70     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.DbControl");
     69  private static final org.slf4j.Logger log =
     70    org.slf4j.LoggerFactory.getLogger(DbControl.class);
    7171
    7272  /*
  • trunk/src/core/net/sf/basedb/core/DynamicResultIterator.java

    r6127 r6444  
    4646    Logger.
    4747  */
    48   private static final org.apache.log4j.Logger log =
    49     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.DynamicResultIterator");
     48  private static final org.slf4j.Logger log =
     49    org.slf4j.LoggerFactory.getLogger(DynamicResultIterator.class);
    5050 
    5151  /**
  • trunk/src/core/net/sf/basedb/core/ExtendedProperties.java

    r6428 r6444  
    5656    Log core events.
    5757  */
    58   private static final org.apache.log4j.Logger log =
    59     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.ExtendedProperties");
     58  private static final org.slf4j.Logger log =
     59    org.slf4j.LoggerFactory.getLogger(ExtendedProperties.class);
    6060
    6161
  • trunk/src/core/net/sf/basedb/core/HibernateUtil.java

    r6037 r6444  
    116116    Log core events.
    117117  */
    118   private static final org.apache.log4j.Logger log =
    119     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core");
     118  private static final org.slf4j.Logger log =
     119    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core");
    120120
    121121  /**
    122122    Log all batcher SQL statements.
    123123  */
    124   private static final org.apache.log4j.Logger logSql =
    125     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.sql");
     124  private static final org.slf4j.Logger logSql =
     125    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.sql");
    126126
    127127
  • trunk/src/core/net/sf/basedb/core/Install.java

    r6432 r6444  
    103103    Log core events.
    104104  */
    105   private static final org.apache.log4j.Logger log =
    106     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.Install");
     105  private static final org.slf4j.Logger log =
     106    org.slf4j.LoggerFactory.getLogger(Install.class);
    107107
    108108  private static org.hibernate.Session session = null;
  • trunk/src/core/net/sf/basedb/core/InternalJobQueue.java

    r6439 r6444  
    162162    Log job queue events.
    163163  */
    164   private static final org.apache.log4j.Logger log =
    165     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.jobqueue");
     164  private static final org.slf4j.Logger log =
     165    org.slf4j.LoggerFactory.getLogger(InternalJobQueue.class);
    166166
    167167  /**
  • trunk/src/core/net/sf/basedb/core/InternalStorageController.java

    r6127 r6444  
    8787    Log storage events.
    8888  */
    89   private static final org.apache.log4j.Logger log =
    90     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.storage.InternalStorageController");
     89  private static final org.slf4j.Logger log =
     90    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.storage.InternalStorageController");
    9191
    9292  /**
  • trunk/src/core/net/sf/basedb/core/Job.java

    r6442 r6444  
    3333import net.sf.basedb.core.data.ShareableData;
    3434import net.sf.basedb.core.data.UserData;
     35import net.sf.basedb.core.plugin.ParameterValues;
    3536import net.sf.basedb.core.plugin.Plugin;
    3637import net.sf.basedb.core.plugin.InteractivePlugin;
     
    14271428
    14281429  /**
     1430    Get the configuration parameters as a {@link ParameterValues} object.
     1431    The parameters are write protected.
     1432   
     1433    @param version The version of the parameters
     1434    @return A ParameterValues object
     1435    @see #getParameterVersion()
     1436    @since 3.3
     1437  */
     1438  public ParameterValues getParameterValues()
     1439  {
     1440    return getParameterValuesImpl();
     1441  }
     1442
     1443  /**
    14291444    Get the names of all parameters for the job.
    14301445    @return A <code>Set</code> containing the names of the parameters or an
  • trunk/src/core/net/sf/basedb/core/JobAgent.java

    r6127 r6444  
    6262    Log events.
    6363  */
    64   private static final org.apache.log4j.Logger log =
    65     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.JobAgent");
     64  private static final org.slf4j.Logger log =
     65    org.slf4j.LoggerFactory.getLogger(JobAgent.class);
    6666 
    6767  /**
  • trunk/src/core/net/sf/basedb/core/Keyring.java

    r6127 r6444  
    6767    Log core events.
    6868  */
    69   private static final org.apache.log4j.Logger log =
    70     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.Keyring");
     69  private static final org.slf4j.Logger log =
     70    org.slf4j.LoggerFactory.getLogger(Keyring.class);
    7171
    7272
  • trunk/src/core/net/sf/basedb/core/LogUtil.java

    r4517 r6444  
    2424import java.sql.SQLException;
    2525
    26 import org.apache.log4j.Logger;
     26import org.slf4j.Logger;
    2727
    2828/**
  • trunk/src/core/net/sf/basedb/core/PluginConfiguration.java

    r6127 r6444  
    482482  public ParameterValues getParameterValues(int version)
    483483  {
    484     return getParameterValuesImpl(getParameterVersion());
     484    return getParameterValuesImpl(version);
    485485  }
    486486 
  • trunk/src/core/net/sf/basedb/core/PredefinedQuery.java

    r5054 r6444  
    6666    Log core events.
    6767  */
    68   private static final org.apache.log4j.Logger log =
    69     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.PredefinedQuery");
     68  private static final org.slf4j.Logger log =
     69    org.slf4j.LoggerFactory.getLogger(PredefinedQuery.class);
    7070
    7171  /**
  • trunk/src/core/net/sf/basedb/core/RawDataBatcher.java

    r6127 r6444  
    7979    Log all SQL statements.
    8080  */
    81   private static final org.apache.log4j.Logger logSql =
    82     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.sql.RawDataBatcher");
     81  private static final org.slf4j.Logger logSql =
     82    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.sql.RawDataBatcher");
    8383 
    8484  /**
  • trunk/src/core/net/sf/basedb/core/RawDataTypes.java

    r5857 r6444  
    6161    Log core events.
    6262  */
    63   private static final org.apache.log4j.Logger log =
    64     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.RawDataTypes");
     63  private static final org.slf4j.Logger log =
     64    org.slf4j.LoggerFactory.getLogger(RawDataTypes.class);
    6565
    6666  /**
  • trunk/src/core/net/sf/basedb/core/SessionControl.java

    r6435 r6444  
    8282    Log core events.
    8383  */
    84   private static final org.apache.log4j.Logger log =
    85     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.SessionControl");
     84  private static final org.slf4j.Logger log =
     85    org.slf4j.LoggerFactory.getLogger(SessionControl.class);
    8686
    8787  /**
  • trunk/src/core/net/sf/basedb/core/Trashcan.java

    r5994 r6444  
    5353    Log trashcan events.
    5454  */
    55   private static final org.apache.log4j.Logger log =
    56     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.Trashcan");
     55  private static final org.slf4j.Logger log =
     56    org.slf4j.LoggerFactory.getLogger(Trashcan.class);
    5757 
    5858  private static final boolean isDebug = log.isDebugEnabled();
  • trunk/src/core/net/sf/basedb/core/Update.java

    r6432 r6444  
    227227    Log core events.
    228228  */
    229   private static final org.apache.log4j.Logger log =
    230     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.Update");
     229  private static final org.slf4j.Logger log =
     230    org.slf4j.LoggerFactory.getLogger(Update.class);
    231231
    232232  /**
  • trunk/src/core/net/sf/basedb/core/VirtualDb.java

    r6127 r6444  
    5454    Log all SQL statements.
    5555  */
    56   private static final org.apache.log4j.Logger logSql =
    57     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.batcher.sql");
     56  private static final org.slf4j.Logger logSql =
     57    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core.batcher.sql");
    5858 
    5959  /**
  • trunk/src/core/net/sf/basedb/core/hibernate/SchemaGenerator.java

    r5889 r6444  
    5353{
    5454 
    55   private static final org.apache.log4j.Logger log =
    56     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.hibernate.SchemaGenerator");
     55  private static final org.slf4j.Logger log =
     56    org.slf4j.LoggerFactory.getLogger(SchemaGenerator.class);
    5757 
    5858  private final Configuration cfg;
  • trunk/src/core/net/sf/basedb/core/query/Hql.java

    r5564 r6444  
    5151    Log core events.
    5252  */
    53   private static final org.apache.log4j.Logger log =
    54     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.query.Hql");
     53  private static final org.slf4j.Logger log =
     54    org.slf4j.LoggerFactory.getLogger(Hql.class);
    5555 
    5656 
  • trunk/src/core/net/sf/basedb/core/signal/AbstractSignalReceiver.java

    r6127 r6444  
    6868    Log signals processing.
    6969  */
    70   private static final org.apache.log4j.Logger logger =
    71     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.AbstractSignalReceiver");
     70  private static final org.slf4j.Logger logger =
     71    org.slf4j.LoggerFactory.getLogger(AbstractSignalReceiver.class);
    7272 
    7373
  • trunk/src/core/net/sf/basedb/core/signal/AbstractSignalTransporter.java

    r6127 r6444  
    4040    Log signals processing.
    4141  */
    42   private static final org.apache.log4j.Logger logger =
    43     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.AbstractSignalTransporter");
     42  private static final org.slf4j.Logger logger =
     43    org.slf4j.LoggerFactory.getLogger(AbstractSignalTransporter.class);
    4444 
    4545  private String globalSignalId;
  • trunk/src/core/net/sf/basedb/core/signal/DelegatingSignalHandler.java

    r6127 r6444  
    4848    Log signals processing.
    4949  */
    50   private static final org.apache.log4j.Logger logger =
    51     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.DelegatingSignalHandler");
     50  private static final org.slf4j.Logger logger =
     51    org.slf4j.LoggerFactory.getLogger(DelegatingSignalHandler.class);
    5252 
    5353  /**
  • trunk/src/core/net/sf/basedb/core/signal/EnhancedThreadSignalHandler.java

    r6127 r6444  
    105105    Log signals processing.
    106106  */
    107   private static final org.apache.log4j.Logger logger =
    108     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.EnhancedThreadSignalHandler");
     107  private static final org.slf4j.Logger logger =
     108    org.slf4j.LoggerFactory.getLogger(EnhancedThreadSignalHandler.class);
    109109
    110110  private final List<Signal> received;
  • trunk/src/core/net/sf/basedb/core/signal/ExtensionSignalTransporter.java

    r6432 r6444  
    4343{
    4444
    45   private static final org.apache.log4j.Logger logger =
    46     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.ExtensionSignalTransporter");
     45  private static final org.slf4j.Logger logger =
     46    org.slf4j.LoggerFactory.getLogger(ExtensionSignalTransporter.class);
    4747 
    4848  private ClientContext context;
  • trunk/src/core/net/sf/basedb/core/signal/ForwardingSignalHandler.java

    r6127 r6444  
    3737    Log signals processing.
    3838  */
    39   private static final org.apache.log4j.Logger logger =
    40     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.ForwardingSignalHandler");
     39  private static final org.slf4j.Logger logger =
     40    org.slf4j.LoggerFactory.getLogger(ForwardingSignalHandler.class);
    4141
    4242  /**
  • trunk/src/core/net/sf/basedb/core/signal/LocalSignalReceiver.java

    r6432 r6444  
    4141    Log signals processing.
    4242  */
    43   private static final org.apache.log4j.Logger logger =
    44     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.LocalSignalReceiver");
     43  private static final org.slf4j.Logger logger =
     44    org.slf4j.LoggerFactory.getLogger(LocalSignalReceiver.class);
    4545
    4646  /**
  • trunk/src/core/net/sf/basedb/core/signal/LocalSignalTransporter.java

    r6127 r6444  
    3737    Log signals processing.
    3838  */
    39   private static final org.apache.log4j.Logger logger =
    40     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.LocalSignalTransporter");
     39  private static final org.slf4j.Logger logger =
     40    org.slf4j.LoggerFactory.getLogger(LocalSignalTransporter.class);
    4141
    4242  /**
  • trunk/src/core/net/sf/basedb/core/signal/ProgressReporterSignalHandler.java

    r6127 r6444  
    105105    Log signals processing.
    106106  */
    107   private static final org.apache.log4j.Logger logger =
    108     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.ProgressReporterSignalHandler");
     107  private static final org.slf4j.Logger logger =
     108    org.slf4j.LoggerFactory.getLogger(ProgressReporterSignalHandler.class);
    109109
    110110  /**
  • trunk/src/core/net/sf/basedb/core/signal/SocketSignalReceiver.java

    r6127 r6444  
    9595    Log signals processing.
    9696  */
    97   private static final org.apache.log4j.Logger logger =
    98     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.SocketSignalReceiver");
     97  private static final org.slf4j.Logger logger =
     98    org.slf4j.LoggerFactory.getLogger(SocketSignalReceiver.class);
    9999
    100100  private InetAddress ip;
  • trunk/src/core/net/sf/basedb/core/signal/SocketSignalTransporter.java

    r6127 r6444  
    4040    Log signals processing.
    4141  */
    42   private static final org.apache.log4j.Logger logger =
    43     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.SocketSignalTransporter");
     42  private static final org.slf4j.Logger logger =
     43    org.slf4j.LoggerFactory.getLogger(SocketSignalTransporter.class);
    4444 
    4545  /**
  • trunk/src/core/net/sf/basedb/core/signal/ThreadSignalHandler.java

    r6127 r6444  
    132132    Log signals processing.
    133133  */
    134   private static final org.apache.log4j.Logger logger =
    135     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core.signal.ThreadSignalHandler");
     134  private static final org.slf4j.Logger logger =
     135    org.slf4j.LoggerFactory.getLogger(ThreadSignalHandler.class);
    136136
    137137 
  • trunk/src/core/net/sf/basedb/util/JarClassLoader.java

    r5622 r6444  
    7777{
    7878
    79   private static final org.apache.log4j.Logger log =
    80     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.JarClassLoader");
     79  private static final org.slf4j.Logger log =
     80    org.slf4j.LoggerFactory.getLogger(JarClassLoader.class);
    8181 
    8282  /**
  • trunk/src/core/net/sf/basedb/util/StaticCache.java

    r5384 r6444  
    7878    Log static cache events.
    7979  */
    80   private static final org.apache.log4j.Logger log =
    81     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.StaticCache");
     80  private static final org.slf4j.Logger log =
     81    org.slf4j.LoggerFactory.getLogger(StaticCache.class);
    8282
    8383  /**
  • trunk/src/core/net/sf/basedb/util/XMLUtil.java

    r5590 r6444  
    6060    Log core events.
    6161  */
    62   private static final org.apache.log4j.Logger log =
    63     org.apache.log4j.LogManager.getLogger("net.sf.basedb.core");
     62  private static final org.slf4j.Logger log =
     63    org.slf4j.LoggerFactory.getLogger("net.sf.basedb.core");
    6464
    6565  /**
  • trunk/src/core/net/sf/basedb/util/extensions/LoggingErrorHandlerFactory.java

    r5488 r6444  
    2424import net.sf.basedb.util.Values;
    2525
    26 import org.apache.log4j.Level;
    2726
    2827/**
     
    4039{
    4140 
    42   private static final org.apache.log4j.Logger log =
    43     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.LoggingErrorHandler");
     41  private static final org.slf4j.Logger log =
     42    org.slf4j.LoggerFactory.getLogger(LoggingErrorHandlerFactory.class);
    4443
    4544  private Level level;
     
    8483  {
    8584    if (rememberLast) ((InvokationContext)context).setError(action, t);
    86     log.log(level, message, t);
     85    level.log(log, message, t);
    8786  }
    8887  // --------------------------------------
     
    9392  public void setLevel(String level)
    9493  {
    95     this.level = Level.toLevel(level, Level.ERROR);
     94    try
     95    {
     96      this.level = Level.valueOf(level);
     97    }
     98    catch (Exception ex)
     99    {}
    96100  }
    97101 
     
    109113  }
    110114 
     115  /**
     116    Log level implementations for slf4j. Use {@link Level#log(org.slf4j.Logger, String, Throwable)}
     117    to log a message at the given level to the slf4j logger.
     118    @since 3.3
     119  */
     120  public static enum Level
     121  {
     122    OFF
     123      {
     124        @Override
     125        public void log(org.slf4j.Logger logger, String message, Throwable t)
     126        {}
     127      },
     128    FATAL
     129    {
     130      @Override
     131      public void log(org.slf4j.Logger logger, String message, Throwable t)
     132      {
     133        logger.error(message, t);
     134      }
     135    },
     136    ERROR
     137    {
     138      @Override
     139      public void log(org.slf4j.Logger logger, String message, Throwable t)
     140      {
     141        logger.error(message, t);
     142      }
     143    },
     144    WARN
     145    {
     146      @Override
     147      public void log(org.slf4j.Logger logger, String message, Throwable t)
     148      {
     149        logger.warn(message, t);
     150      }
     151    },
     152    INFO
     153    {
     154      @Override
     155      public void log(org.slf4j.Logger logger, String message, Throwable t)
     156      {
     157        logger.info(message, t);
     158      }
     159    },
     160    DEBUG
     161    {
     162      @Override
     163      public void log(org.slf4j.Logger logger, String message, Throwable t)
     164      {
     165        logger.debug(message, t);
     166      }
     167    },
     168    TRACE
     169    {
     170      @Override
     171      public void log(org.slf4j.Logger logger, String message, Throwable t)
     172      {
     173        logger.trace(message, t);
     174      }
     175    };
     176   
     177    public abstract void log(org.slf4j.Logger logger, String message, Throwable t);
     178   
     179  }
    111180}
  • trunk/src/core/net/sf/basedb/util/extensions/Registry.java

    r6030 r6444  
    5656{
    5757
    58   private static final org.apache.log4j.Logger log =
    59     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.Registry");
     58  private static final org.slf4j.Logger log =
     59    org.slf4j.LoggerFactory.getLogger(Registry.class);
    6060
    6161  /**
  • trunk/src/core/net/sf/basedb/util/extensions/RethrowErrorHandlerFactory.java

    r5487 r6444  
    3737{
    3838 
    39   private static final org.apache.log4j.Logger log =
    40     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.RethrowErrorHandler");
     39  private static final org.slf4j.Logger log =
     40    org.slf4j.LoggerFactory.getLogger(RethrowErrorHandlerFactory.class);
    4141
    4242 
  • trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java

    r5823 r6444  
    6262  implements Comparable<ExtensionsFile>
    6363{
    64   private static final org.apache.log4j.Logger log =
    65     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.ExtensionsFile");
     64  private static final org.slf4j.Logger log =
     65    org.slf4j.LoggerFactory.getLogger(ExtensionsFile.class);
    6666
    6767  private final ExtensionsManager manager;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsManager.java

    r5691 r6444  
    5454{
    5555 
    56   private static final org.apache.log4j.Logger log =
    57     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.ExtensionsManager");
     56  private static final org.slf4j.Logger log =
     57    org.slf4j.LoggerFactory.getLogger(ExtensionsManager.class);
    5858
    5959  // Main registry for extensions
  • trunk/src/core/net/sf/basedb/util/extensions/manager/filter/DeletedFilter.java

    r5603 r6444  
    3737{
    3838 
    39   private static final org.apache.log4j.Logger log =
    40     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.filter.DeletedFilter");
     39  private static final org.slf4j.Logger log =
     40    org.slf4j.LoggerFactory.getLogger(DeletedFilter.class);
    4141
    4242 
  • trunk/src/core/net/sf/basedb/util/extensions/manager/filter/InstalledFilter.java

    r5616 r6444  
    4242{
    4343 
    44   private static final org.apache.log4j.Logger log =
    45     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.filter.InstalledFilter");
     44  private static final org.slf4j.Logger log =
     45    org.slf4j.LoggerFactory.getLogger(InstalledFilter.class);
    4646
    4747  private final Settings settings;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/filter/InvalidAndModifiedFilter.java

    r5607 r6444  
    3737{
    3838 
    39   private static final org.apache.log4j.Logger log =
    40     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.filter.InvalidAndModifiedFilter");
     39  private static final org.slf4j.Logger log =
     40    org.slf4j.LoggerFactory.getLogger(InvalidAndModifiedFilter.class);
    4141
    4242 
  • trunk/src/core/net/sf/basedb/util/extensions/manager/filter/ValidAndNewOrModifiedFilter.java

    r5616 r6444  
    3939{
    4040 
    41   private static final org.apache.log4j.Logger log =
    42     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.filter.ValidAndNewOrModifiedFilter");
     41  private static final org.slf4j.Logger log =
     42    org.slf4j.LoggerFactory.getLogger(ValidAndNewOrModifiedFilter.class);
    4343
    4444  private final boolean allowUnmodified;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/DeleteResourcesProcessor.java

    r6379 r6444  
    5555{
    5656
    57   private static final org.apache.log4j.Logger log =
    58     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.processor.DeleteResourcesProcessor");
     57  private static final org.slf4j.Logger log =
     58    org.slf4j.LoggerFactory.getLogger(DeleteResourcesProcessor.class);
    5959 
    6060  private final File mainDir;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/DisablePluginsProcessor.java

    r6379 r6444  
    4343{
    4444
    45   private static final org.apache.log4j.Logger log =
    46     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.DisablePluginsProcessor");
     45  private static final org.slf4j.Logger log =
     46    org.slf4j.LoggerFactory.getLogger(DisablePluginsProcessor.class);
    4747
    4848  private final DbControl dc;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/ExtractResourcesProcessor.java

    r6379 r6444  
    6565{
    6666
    67   private static final org.apache.log4j.Logger log =
    68     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.ExtractResourcesProcessor");
     67  private static final org.slf4j.Logger log =
     68    org.slf4j.LoggerFactory.getLogger(ExtractResourcesProcessor.class);
    6969 
    7070  private final File mainDir;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/PluginInstallationProcessor.java

    r6379 r6444  
    6363{
    6464
    65   private static final org.apache.log4j.Logger log =
    66     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.PluginInstallationProcessor");
     65  private static final org.slf4j.Logger log =
     66    org.slf4j.LoggerFactory.getLogger(PluginInstallationProcessor.class);
    6767
    6868  private final DbControl dc;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/RegisterExtensionsProcessor.java

    r6379 r6444  
    7171
    7272 
    73   private static final org.apache.log4j.Logger log =
    74     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.RegisterExtensionsProcessor");
     73  private static final org.slf4j.Logger log =
     74    org.slf4j.LoggerFactory.getLogger(RegisterExtensionsProcessor.class);
    7575 
    7676  private final XmlLoader loader;
  • trunk/src/core/net/sf/basedb/util/extensions/manager/processor/UnregisterExtensionsProcessor.java

    r6379 r6444  
    5050{
    5151
    52   private static final org.apache.log4j.Logger log =
    53     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.manager.UnregisterExtensionsProcessor");
     52  private static final org.slf4j.Logger log =
     53    org.slf4j.LoggerFactory.getLogger(UnregisterExtensionsProcessor.class);
    5454
    5555  private final ProcessResults results;
  • trunk/src/core/net/sf/basedb/util/extensions/xml/XmlLoader.java

    r6408 r6444  
    128128public class XmlLoader
    129129{
    130   private static final org.apache.log4j.Logger log =
    131     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.extensions.xml.XmlLoader");
     130  private static final org.slf4j.Logger log =
     131    org.slf4j.LoggerFactory.getLogger(XmlLoader.class);
    132132
    133133  /**
  • trunk/src/core/net/sf/basedb/util/jobagent/JobAgentServerConnection.java

    r6127 r6444  
    2929import java.nio.channels.SocketChannel;
    3030
    31 import org.apache.log4j.Logger;
     31import org.slf4j.Logger;
    3232
    3333import net.sf.basedb.util.SocketUtil;
  • trunk/src/core/net/sf/basedb/util/jobagent/RequestHandler.java

    r4515 r6444  
    2424import java.net.Socket;
    2525
    26 import org.apache.log4j.Logger;
     26import org.slf4j.Logger;
    2727
    2828
  • trunk/src/core/net/sf/basedb/util/overview/GenericOverview.java

    r5818 r6444  
    8181  implements OverviewContext
    8282{
    83   private static final org.apache.log4j.Logger log =
    84     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.overview.GenericOverview");
     83  private static final org.slf4j.Logger log =
     84    org.slf4j.LoggerFactory.getLogger(GenericOverview.class);
    8585  private static final boolean debug = log.isDebugEnabled();
    8686
  • trunk/src/core/net/sf/basedb/util/overview/loader/AbstractNodeLoader.java

    r6127 r6444  
    4242  implements NodeLoader<I>
    4343{
    44   private static final org.apache.log4j.Logger log =
    45     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.overview.loader.AbstractNodeLoader");
     44  private static final org.slf4j.Logger log =
     45    org.slf4j.LoggerFactory.getLogger(AbstractNodeLoader.class);
     46 
    4647  private static final boolean debug = log.isDebugEnabled();
    4748
  • trunk/src/core/net/sf/basedb/util/overview/loader/BasicItemNodeLoader.java

    r6042 r6444  
    4343  extends AbstractNodeLoader<I>
    4444{
    45   private static final org.apache.log4j.Logger log =
    46     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.overview.loader.BasicItemNodeLoader");
     45  private static final org.slf4j.Logger log =
     46    org.slf4j.LoggerFactory.getLogger(BasicItemNodeLoader.class);
    4747  private static final boolean debug = log.isDebugEnabled();
    4848
  • trunk/src/core/net/sf/basedb/util/overview/loader/BasicItemNodeLoaderFactory.java

    r6210 r6444  
    4646  implements NodeLoaderFactory<BasicItem, Object>
    4747{
    48   private static final org.apache.log4j.Logger log =
    49     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.overview.loader.BasicItemNodeLoaderFactory");
     48  private static final org.slf4j.Logger log =
     49    org.slf4j.LoggerFactory.getLogger(BasicItemNodeLoaderFactory.class);
    5050  private static final boolean debug = log.isDebugEnabled();
    5151 
  • trunk/src/core/net/sf/basedb/util/overview/node/NodeFactory.java

    r5818 r6444  
    4949public class NodeFactory<I extends BasicItem>
    5050{
    51   private static final org.apache.log4j.Logger log =
    52     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.overview.node.NodeFactory");
     51  private static final org.slf4j.Logger log =
     52    org.slf4j.LoggerFactory.getLogger(NodeFactory.class);
    5353  private static final boolean debug = log.isDebugEnabled();
    5454
  • trunk/src/core/net/sf/basedb/util/resources/ResourceBundleWrapper.java

    r5409 r6444  
    4040{
    4141
    42   private static final org.apache.log4j.Logger log =
    43     org.apache.log4j.LogManager.getLogger("net.sf.basedb.util.resource.ResourceBundleWrapper");
     42  private static final org.slf4j.Logger log =
     43    org.slf4j.LoggerFactory.getLogger(ResourceBundleWrapper.class);
    4444
    4545  private final String name;
Note: See TracChangeset for help on using the changeset viewer.