diff --git a/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java index d347430cc..b903c89bf 100644 --- a/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java +++ b/src/main/java/io/ebeaninternal/server/changelog/DefaultChangeLogListener.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Properties; /** - * Logs the change sets in JSON to logger named org.avaje.ebean.ChangeLog. + * Logs the change sets in JSON to logger named io.ebean.ChangeLog. *

* The logged entries duplicate/denormalise the transaction details so that each bean change * is fully contained with the transaction information. @@ -30,7 +30,7 @@ public class DefaultChangeLogListener implements ChangeLogListener, Plugin { /** * The named logger we send the change set payload to. Can be externally configured as desired. */ - protected static final Logger changeLog = LoggerFactory.getLogger("org.avaje.ebean.ChangeLog"); + protected static final Logger changeLog = LoggerFactory.getLogger("io.ebean.ChangeLog"); /** * Used to build the JSON. diff --git a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java index 003f09942..aa8f2fcf4 100644 --- a/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java +++ b/src/main/java/io/ebeaninternal/server/cluster/ClusterManager.java @@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class ClusterManager { - private static final Logger clusterLogger = LoggerFactory.getLogger("org.avaje.ebean.Cluster"); + private static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster"); private static final Logger logger = LoggerFactory.getLogger(ClusterManager.class); diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index b2a6d0b4c..8efe338ab 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -37,10 +37,10 @@ final class BeanDescriptorCacheHelp { private static final Logger logger = LoggerFactory.getLogger(BeanDescriptorCacheHelp.class); - private static final Logger queryLog = LoggerFactory.getLogger("org.avaje.ebean.cache.QUERY"); - private static final Logger beanLog = LoggerFactory.getLogger("org.avaje.ebean.cache.BEAN"); - private static final Logger manyLog = LoggerFactory.getLogger("org.avaje.ebean.cache.COLL"); - private static final Logger natLog = LoggerFactory.getLogger("org.avaje.ebean.cache.NATKEY"); + private static final Logger queryLog = LoggerFactory.getLogger("io.ebean.cache.QUERY"); + private static final Logger beanLog = LoggerFactory.getLogger("io.ebean.cache.BEAN"); + private static final Logger manyLog = LoggerFactory.getLogger("io.ebean.cache.COLL"); + private static final Logger natLog = LoggerFactory.getLogger("io.ebean.cache.NATKEY"); private final BeanDescriptor desc; diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index ce7d06f4a..b5a606ad3 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -59,7 +59,7 @@ import java.util.Set; */ public final class DefaultPersister implements Persister { - private static final Logger PUB = LoggerFactory.getLogger("org.avaje.ebean.PUB"); + private static final Logger PUB = LoggerFactory.getLogger("io.ebean.PUB"); private static final Logger logger = LoggerFactory.getLogger(DefaultPersister.class); diff --git a/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java index 4646b646c..05f0b9646 100644 --- a/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java +++ b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java @@ -20,9 +20,9 @@ public class DefaultReadAuditLogger implements ReadAuditLogger { private static final Logger appLogger = LoggerFactory.getLogger(DefaultReadAuditLogger.class); - private static final Logger queryLogger = LoggerFactory.getLogger("org.avaje.ebean.ReadAuditQuery"); + private static final Logger queryLogger = LoggerFactory.getLogger("io.ebean.ReadAuditQuery"); - private static final Logger auditLogger = LoggerFactory.getLogger("org.avaje.ebean.ReadAudit"); + private static final Logger auditLogger = LoggerFactory.getLogger("io.ebean.ReadAudit"); protected final JsonFactory jsonFactory = new JsonFactory(); diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 426e10671..3300b7a32 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -34,13 +34,13 @@ public class TransactionManager { private static final Logger logger = LoggerFactory.getLogger(TransactionManager.class); - public static final Logger clusterLogger = LoggerFactory.getLogger("org.avaje.ebean.Cluster"); + public static final Logger clusterLogger = LoggerFactory.getLogger("io.ebean.Cluster"); - public static final Logger SQL_LOGGER = LoggerFactory.getLogger("org.avaje.ebean.SQL"); + public static final Logger SQL_LOGGER = LoggerFactory.getLogger("io.ebean.SQL"); - public static final Logger SUM_LOGGER = LoggerFactory.getLogger("org.avaje.ebean.SUM"); + public static final Logger SUM_LOGGER = LoggerFactory.getLogger("io.ebean.SUM"); - public static final Logger TXN_LOGGER = LoggerFactory.getLogger("org.avaje.ebean.TXN"); + public static final Logger TXN_LOGGER = LoggerFactory.getLogger("io.ebean.TXN"); protected final BeanDescriptorManager beanDescriptorManager; diff --git a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java b/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java index 6d32b6ff0..5b3e64a6e 100644 --- a/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java +++ b/src/test/java/org/avaje/ebeantest/LoggedSqlCollector.java @@ -20,7 +20,7 @@ import java.util.List; */ public class LoggedSqlCollector { - static Logger logger = (Logger) LoggerFactory.getLogger("org.avaje.ebean.SQL"); + static Logger logger = (Logger) LoggerFactory.getLogger("io.ebean.SQL"); private static BasicAppender basicAppender = new BasicAppender(); diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 461365004..6dde77872 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -77,24 +77,21 @@ - - + - - - - + + + - - - - + + + + - + -