From 6718c1482b47fdc9fbb0f6a7d677af6caae943af Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 11 Sep 2022 21:27:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E7=BB=93=E6=9E=84=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liteflow/script/ScriptExecutor.java | 0 .../script/ScriptExecutorFactory.java | 0 .../exception/ScriptExecuteException.java | 0 .../script/exception/ScriptLoadException.java | 0 .../script/exception/ScriptSpiException.java | 0 .../liteflow-rule-zk}/pom.xml | 2 +- .../parser/spi/zk/ZkParserClassNameSpi.java | 0 .../liteflow/parser/zk/ZkXmlELParser.java | 0 .../parser/zk/exception/ZkException.java | 0 .../parser/zk/util/ZkParserHelper.java | 0 .../liteflow/parser/zk/vo/ZkParserVO.java | 0 ...hub.liteflow.parser.spi.ParserClassNameSpi | 0 .../pom.xml | 17 +++++--------- .../liteflow-script-groovy}/pom.xml | 2 +- .../script/groovy/GroovyScriptExecutor.java | 0 ...com.yomahub.liteflow.script.ScriptExecutor | 0 .../liteflow-script-qlexpress}/pom.xml | 2 +- .../qlexpress/QLExpressScriptExecutor.java | 0 ...com.yomahub.liteflow.script.ScriptExecutor | 0 liteflow-script-plugin/pom.xml | 22 +++++++++++++++++++ pom.xml | 6 ++--- 21 files changed, 33 insertions(+), 18 deletions(-) rename {liteflow-script-common => liteflow-core}/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java (100%) rename {liteflow-script-common => liteflow-core}/src/main/java/com/yomahub/liteflow/script/ScriptExecutorFactory.java (100%) rename {liteflow-script-common => liteflow-core}/src/main/java/com/yomahub/liteflow/script/exception/ScriptExecuteException.java (100%) rename {liteflow-script-common => liteflow-core}/src/main/java/com/yomahub/liteflow/script/exception/ScriptLoadException.java (100%) rename {liteflow-script-common => liteflow-core}/src/main/java/com/yomahub/liteflow/script/exception/ScriptSpiException.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/pom.xml (96%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java (100%) rename {liteflow-rule-zk => liteflow-rule-plugin/liteflow-rule-zk}/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi (100%) rename {liteflow-script-common => liteflow-rule-plugin}/pom.xml (57%) rename {liteflow-script-groovy => liteflow-script-plugin/liteflow-script-groovy}/pom.xml (95%) rename {liteflow-script-groovy => liteflow-script-plugin/liteflow-script-groovy}/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java (100%) rename {liteflow-script-groovy => liteflow-script-plugin/liteflow-script-groovy}/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor (100%) rename {liteflow-script-qlexpress => liteflow-script-plugin/liteflow-script-qlexpress}/pom.xml (95%) rename {liteflow-script-qlexpress => liteflow-script-plugin/liteflow-script-qlexpress}/src/main/java/com/yomahub/liteflow/script/qlexpress/QLExpressScriptExecutor.java (100%) rename {liteflow-script-qlexpress => liteflow-script-plugin/liteflow-script-qlexpress}/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor (100%) create mode 100644 liteflow-script-plugin/pom.xml diff --git a/liteflow-script-common/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java similarity index 100% rename from liteflow-script-common/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java diff --git a/liteflow-script-common/src/main/java/com/yomahub/liteflow/script/ScriptExecutorFactory.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutorFactory.java similarity index 100% rename from liteflow-script-common/src/main/java/com/yomahub/liteflow/script/ScriptExecutorFactory.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutorFactory.java diff --git a/liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptExecuteException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptExecuteException.java similarity index 100% rename from liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptExecuteException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptExecuteException.java diff --git a/liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptLoadException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptLoadException.java similarity index 100% rename from liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptLoadException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptLoadException.java diff --git a/liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptSpiException.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptSpiException.java similarity index 100% rename from liteflow-script-common/src/main/java/com/yomahub/liteflow/script/exception/ScriptSpiException.java rename to liteflow-core/src/main/java/com/yomahub/liteflow/script/exception/ScriptSpiException.java diff --git a/liteflow-rule-zk/pom.xml b/liteflow-rule-plugin/liteflow-rule-zk/pom.xml similarity index 96% rename from liteflow-rule-zk/pom.xml rename to liteflow-rule-plugin/liteflow-rule-zk/pom.xml index 740cfd04d..8db6b789d 100644 --- a/liteflow-rule-zk/pom.xml +++ b/liteflow-rule-plugin/liteflow-rule-zk/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + liteflow-rule-plugin com.yomahub - liteflow ${revision} ../pom.xml diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java similarity index 100% rename from liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/spi/zk/ZkParserClassNameSpi.java diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java similarity index 100% rename from liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/ZkXmlELParser.java diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java similarity index 100% rename from liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/exception/ZkException.java diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java similarity index 100% rename from liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/util/ZkParserHelper.java diff --git a/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java b/liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java similarity index 100% rename from liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/java/com/yomahub/liteflow/parser/zk/vo/ZkParserVO.java diff --git a/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi b/liteflow-rule-plugin/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi similarity index 100% rename from liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi rename to liteflow-rule-plugin/liteflow-rule-zk/src/main/resources/META-INF/services/com.yomahub.liteflow.parser.spi.ParserClassNameSpi diff --git a/liteflow-script-common/pom.xml b/liteflow-rule-plugin/pom.xml similarity index 57% rename from liteflow-script-common/pom.xml rename to liteflow-rule-plugin/pom.xml index 9a66228f9..4e1601b44 100644 --- a/liteflow-script-common/pom.xml +++ b/liteflow-rule-plugin/pom.xml @@ -9,17 +9,12 @@ ../pom.xml 4.0.0 + pom + + liteflow-rule-zk + + + liteflow-rule-plugin - liteflow-script-common - - - org.springframework - spring-beans - - - cn.hutool - hutool-core - - \ No newline at end of file diff --git a/liteflow-script-groovy/pom.xml b/liteflow-script-plugin/liteflow-script-groovy/pom.xml similarity index 95% rename from liteflow-script-groovy/pom.xml rename to liteflow-script-plugin/liteflow-script-groovy/pom.xml index dfc22b814..6f50dccb4 100644 --- a/liteflow-script-groovy/pom.xml +++ b/liteflow-script-plugin/liteflow-script-groovy/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - liteflow + liteflow-script-plugin com.yomahub ${revision} ../pom.xml diff --git a/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java b/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java similarity index 100% rename from liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java rename to liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java diff --git a/liteflow-script-groovy/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor b/liteflow-script-plugin/liteflow-script-groovy/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor similarity index 100% rename from liteflow-script-groovy/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor rename to liteflow-script-plugin/liteflow-script-groovy/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor diff --git a/liteflow-script-qlexpress/pom.xml b/liteflow-script-plugin/liteflow-script-qlexpress/pom.xml similarity index 95% rename from liteflow-script-qlexpress/pom.xml rename to liteflow-script-plugin/liteflow-script-qlexpress/pom.xml index 86afa6164..874de5176 100644 --- a/liteflow-script-qlexpress/pom.xml +++ b/liteflow-script-plugin/liteflow-script-qlexpress/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - liteflow + liteflow-script-plugin com.yomahub ${revision} ../pom.xml diff --git a/liteflow-script-qlexpress/src/main/java/com/yomahub/liteflow/script/qlexpress/QLExpressScriptExecutor.java b/liteflow-script-plugin/liteflow-script-qlexpress/src/main/java/com/yomahub/liteflow/script/qlexpress/QLExpressScriptExecutor.java similarity index 100% rename from liteflow-script-qlexpress/src/main/java/com/yomahub/liteflow/script/qlexpress/QLExpressScriptExecutor.java rename to liteflow-script-plugin/liteflow-script-qlexpress/src/main/java/com/yomahub/liteflow/script/qlexpress/QLExpressScriptExecutor.java diff --git a/liteflow-script-qlexpress/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor b/liteflow-script-plugin/liteflow-script-qlexpress/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor similarity index 100% rename from liteflow-script-qlexpress/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor rename to liteflow-script-plugin/liteflow-script-qlexpress/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor diff --git a/liteflow-script-plugin/pom.xml b/liteflow-script-plugin/pom.xml new file mode 100644 index 000000000..be8c8929b --- /dev/null +++ b/liteflow-script-plugin/pom.xml @@ -0,0 +1,22 @@ + + + + liteflow + com.yomahub + ${revision} + ../pom.xml + + 4.0.0 + pom + + + liteflow-script-plugin + + + liteflow-script-qlexpress + liteflow-script-groovy + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 28a50e57d..f9186b488 100644 --- a/pom.xml +++ b/pom.xml @@ -318,14 +318,12 @@ liteflow-core + liteflow-script-plugin + liteflow-rule-plugin liteflow-spring-boot-starter - liteflow-script-qlexpress - liteflow-script-common - liteflow-script-groovy liteflow-spring liteflow-testcase-old liteflow-testcase-el - liteflow-rule-zk