diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java index c6881ea57..59c7ce048 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/GlobalLogFactory.java @@ -12,12 +12,12 @@ package org.dromara.hutool.log; -import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory; -import org.dromara.hutool.log.dialect.console.ConsoleLogFactory; -import org.dromara.hutool.log.dialect.jdk.JdkLogFactory; -import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory; -import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory; -import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory; +import org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory; +import org.dromara.hutool.log.engine.console.ConsoleLogFactory; +import org.dromara.hutool.log.engine.jdk.JdkLogFactory; +import org.dromara.hutool.log.engine.log4j.Log4jLogFactory; +import org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory; +import org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory; /** * 全局日志工厂类
diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java index 31beaa643..dcf2dd996 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/LogFactory.java @@ -16,8 +16,8 @@ import org.dromara.hutool.core.io.resource.ResourceUtil; import org.dromara.hutool.core.lang.caller.CallerUtil; import org.dromara.hutool.core.map.SafeConcurrentHashMap; import org.dromara.hutool.core.util.ServiceLoaderUtil; -import org.dromara.hutool.log.dialect.console.ConsoleLogFactory; -import org.dromara.hutool.log.dialect.jdk.JdkLogFactory; +import org.dromara.hutool.log.engine.console.ConsoleLogFactory; +import org.dromara.hutool.log.engine.jdk.JdkLogFactory; import java.net.URL; import java.util.Map; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java index 4c384e446..ec4f9fba5 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.commons; +package org.dromara.hutool.log.engine.commons; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java index 9f0b064ab..00be33eed 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLog4JLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLog4JLog.java @@ -10,12 +10,12 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.commons; +package org.dromara.hutool.log.engine.commons; import org.apache.commons.logging.Log; import org.apache.commons.logging.impl.Log4JLogger; -import org.dromara.hutool.log.dialect.log4j.Log4jLog; +import org.dromara.hutool.log.engine.log4j.Log4jLog; /** * Apache Commons Logging for Log4j diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogFactory.java similarity index 96% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogFactory.java index fd436d1bb..f6916711f 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/ApacheCommonsLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/ApacheCommonsLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.commons; +package org.dromara.hutool.log.engine.commons; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java index 38d169e75..a9443ff86 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/commons/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/commons/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.commons; +package org.dromara.hutool.log.engine.commons; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java index 38862a1f1..b8ee51eb6 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.console; +package org.dromara.hutool.log.engine.console; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.lang.ansi.Ansi4BitColor; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogFactory.java index 665653312..2cbdada3a 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleColorLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleColorLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.console; +package org.dromara.hutool.log.engine.console; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java index 5b5cc3e73..e39d58427 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.console; +package org.dromara.hutool.log.engine.console; import org.dromara.hutool.core.date.DateUtil; import org.dromara.hutool.core.lang.Assert; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogFactory.java index 0117b81e3..0639729d6 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/ConsoleLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/ConsoleLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.console; +package org.dromara.hutool.log.engine.console; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java index d5d89bf82..2eb5b29cc 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/console/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/console/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.console; +package org.dromara.hutool.log.engine.console; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java index 019241b6a..0ac16bef3 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.jboss; +package org.dromara.hutool.log.engine.jboss; import org.jboss.logging.Logger; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogFactory.java index 946fe015d..2e0c97f3b 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/JbossLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/JbossLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.jboss; +package org.dromara.hutool.log.engine.jboss; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java index 66c7fdee6..ea0e22f4e 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jboss/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jboss/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.jboss; +package org.dromara.hutool.log.engine.jboss; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java similarity index 99% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java index 3e31a6745..f87b478c4 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.jdk; +package org.dromara.hutool.log.engine.jdk; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogFactory.java similarity index 97% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogFactory.java index 79daa413a..279a65433 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/JdkLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/JdkLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.jdk; +package org.dromara.hutool.log.engine.jdk; import java.io.InputStream; import java.util.logging.LogManager; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java similarity index 93% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java index fd93a37c9..d4483c266 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/jdk/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/jdk/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.jdk; +package org.dromara.hutool.log.engine.jdk; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java index b6be3660f..d944dec77 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.log4j; +package org.dromara.hutool.log.engine.log4j; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogFactory.java index d07805709..7d15f2f6f 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/Log4jLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/Log4jLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.log4j; +package org.dromara.hutool.log.engine.log4j; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java index 3ba5ea1c7..d27be5bad 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.log4j; +package org.dromara.hutool.log.engine.log4j; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java similarity index 99% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java index d6ae59cfb..96a2a4f9e 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2Log.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2Log.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.log4j2; +package org.dromara.hutool.log.engine.log4j2; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogFactory.java index d3ec19622..d6386c959 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/Log4j2LogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/Log4j2LogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.log4j2; +package org.dromara.hutool.log.engine.log4j2; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java index 46266f8df..5f854dd89 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/log4j2/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/log4j2/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.log4j2; +package org.dromara.hutool.log.engine.log4j2; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java similarity index 98% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java index dd4e0ed80..b434d0f5e 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.logtube; +package org.dromara.hutool.log.engine.logtube; import org.dromara.hutool.core.exceptions.ExceptionUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogFactory.java index 1d4cd785e..aeaa63b32 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/LogTubeLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/LogTubeLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.logtube; +package org.dromara.hutool.log.engine.logtube; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java index 91ea5afe6..5b8b60f85 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/logtube/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/logtube/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.logtube; +package org.dromara.hutool.log.engine.logtube; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java similarity index 93% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java index 5c2955d31..3c555a66d 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect; +package org.dromara.hutool.log.engine; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java similarity index 99% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java index 4c8d7612e..2bb4c23eb 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.slf4j; +package org.dromara.hutool.log.engine.slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java similarity index 97% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java index b8ea31b2b..cbfa49c32 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/Slf4jLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/Slf4jLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.slf4j; +package org.dromara.hutool.log.engine.slf4j; import java.io.OutputStream; import java.io.PrintStream; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java similarity index 92% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java index a19dd7d75..3531d1015 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/slf4j/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/slf4j/package-info.java @@ -16,4 +16,4 @@ * @author looly * */ -package org.dromara.hutool.log.dialect.slf4j; +package org.dromara.hutool.log.engine.slf4j; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java similarity index 99% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java index 2ee8650da..c89decad7 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.tinylog; +package org.dromara.hutool.log.engine.tinylog; import org.dromara.hutool.log.AbstractLog; import org.pmw.tinylog.Level; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java similarity index 99% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java index c3475b425..d3a4e983b 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.tinylog; +package org.dromara.hutool.log.engine.tinylog; import org.dromara.hutool.core.array.ArrayUtil; import org.dromara.hutool.core.text.StrUtil; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Factory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Factory.java index 45214bdc6..e20f577e0 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLog2Factory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLog2Factory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.tinylog; +package org.dromara.hutool.log.engine.tinylog; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogFactory.java similarity index 95% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogFactory.java index c68897f61..8ab80a31b 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/TinyLogFactory.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/TinyLogFactory.java @@ -10,7 +10,7 @@ * See the Mulan PSL v2 for more details. */ -package org.dromara.hutool.log.dialect.tinylog; +package org.dromara.hutool.log.engine.tinylog; import org.dromara.hutool.log.Log; import org.dromara.hutool.log.LogFactory; diff --git a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java similarity index 93% rename from hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java rename to hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java index 2a0fb26e1..5cc80665d 100644 --- a/hutool-log/src/main/java/org/dromara/hutool/log/dialect/tinylog/package-info.java +++ b/hutool-log/src/main/java/org/dromara/hutool/log/engine/tinylog/package-info.java @@ -16,4 +16,4 @@ * * @author looly */ -package org.dromara.hutool.log.dialect.tinylog; +package org.dromara.hutool.log.engine.tinylog; diff --git a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory index 42ab283cc..03bafdf8f 100644 --- a/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory +++ b/hutool-log/src/main/resources/META-INF/services/org.dromara.hutool.log.LogFactory @@ -10,11 +10,11 @@ # See the Mulan PSL v2 for more details. # -org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory -org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory -org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory -org.dromara.hutool.log.dialect.log4j.Log4jLogFactory -org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory -org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory -org.dromara.hutool.log.dialect.tinylog.TinyLogFactory -org.dromara.hutool.log.dialect.jboss.JbossLogFactory +org.dromara.hutool.log.engine.logtube.LogTubeLogFactory +org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory +org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory +org.dromara.hutool.log.engine.log4j.Log4jLogFactory +org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory +org.dromara.hutool.log.engine.tinylog.TinyLog2Factory +org.dromara.hutool.log.engine.tinylog.TinyLogFactory +org.dromara.hutool.log.engine.jboss.JbossLogFactory diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java index 978688e12..b0f73b6bc 100644 --- a/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java +++ b/hutool-log/src/test/java/org/dromara/hutool/log/CustomLogTest.java @@ -1,14 +1,14 @@ package org.dromara.hutool.log; -import org.dromara.hutool.log.dialect.commons.ApacheCommonsLogFactory; -import org.dromara.hutool.log.dialect.console.ConsoleLogFactory; -import org.dromara.hutool.log.dialect.jboss.JbossLogFactory; -import org.dromara.hutool.log.dialect.jdk.JdkLogFactory; -import org.dromara.hutool.log.dialect.log4j.Log4jLogFactory; -import org.dromara.hutool.log.dialect.log4j2.Log4j2LogFactory; -import org.dromara.hutool.log.dialect.slf4j.Slf4jLogFactory; -import org.dromara.hutool.log.dialect.tinylog.TinyLog2Factory; -import org.dromara.hutool.log.dialect.tinylog.TinyLogFactory; +import org.dromara.hutool.log.engine.commons.ApacheCommonsLogFactory; +import org.dromara.hutool.log.engine.console.ConsoleLogFactory; +import org.dromara.hutool.log.engine.jboss.JbossLogFactory; +import org.dromara.hutool.log.engine.jdk.JdkLogFactory; +import org.dromara.hutool.log.engine.log4j.Log4jLogFactory; +import org.dromara.hutool.log.engine.log4j2.Log4j2LogFactory; +import org.dromara.hutool.log.engine.slf4j.Slf4jLogFactory; +import org.dromara.hutool.log.engine.tinylog.TinyLog2Factory; +import org.dromara.hutool.log.engine.tinylog.TinyLogFactory; import org.junit.jupiter.api.Test; /** diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java index e4fc1d42c..961e125c8 100644 --- a/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java +++ b/hutool-log/src/test/java/org/dromara/hutool/log/LogTubeTest.java @@ -1,6 +1,6 @@ package org.dromara.hutool.log; -import org.dromara.hutool.log.dialect.logtube.LogTubeLogFactory; +import org.dromara.hutool.log.engine.logtube.LogTubeLogFactory; import org.junit.jupiter.api.Test; public class LogTubeTest { diff --git a/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java b/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java index 6cc08f380..3f3f5cee4 100644 --- a/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java +++ b/hutool-log/src/test/java/org/dromara/hutool/log/StaticLogTest.java @@ -1,7 +1,7 @@ package org.dromara.hutool.log; -import org.dromara.hutool.log.dialect.console.ConsoleColorLogFactory; -import org.dromara.hutool.log.dialect.console.ConsoleLogFactory; +import org.dromara.hutool.log.engine.console.ConsoleColorLogFactory; +import org.dromara.hutool.log.engine.console.ConsoleLogFactory; import org.junit.jupiter.api.Test; public class StaticLogTest {