This is an automated email from the ASF dual-hosted git repository.
wangguangyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 26e0af683 Refactor example module structure
new 082e06864 Merge pull request #2299 from terrymanu/dev
26e0af683 is described below
commit 26e0af683183a927b185b9a199fd9d6e888b394b
Author: zhangliang <zhangli...@apache.org>
AuthorDate: Sun Oct 15 15:37:20 2023 +0800
Refactor example module structure
---
.../pom.xml | 2 +-
.../java/org/apache/shardingsphere/elasticjob/example/JavaMain.java | 2 +-
.../src/main/resources/logback.xml | 2 +-
.../src/main/resources/script/demo.bat | 0
.../src/main/resources/script/demo.sh | 0
.../pom.xml | 2 +-
.../org/apache/shardingsphere/elasticjob/example/SpringMain.java | 0
.../src/main/resources/META-INF/application-context.xml | 0
.../src/main/resources/conf/job.properties | 2 +-
.../src/main/resources/conf/reg.properties | 2 +-
.../src/main/resources/logback.xml | 2 +-
.../src/main/resources/script/demo.bat | 0
.../src/main/resources/script/demo.sh | 0
.../pom.xml | 2 +-
.../apache/shardingsphere/elasticjob/example/SpringBootMain.java | 0
.../elasticjob/example/controller/OneOffJobController.java | 0
.../org/apache/shardingsphere/elasticjob/example/entity/Foo.java | 0
.../elasticjob/example/job/SpringBootDataflowJob.java | 0
.../example/job/SpringBootOccurErrorNoticeDingtalkJob.java | 0
.../elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java | 0
.../elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java | 0
.../shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java | 0
.../shardingsphere/elasticjob/example/repository/FooRepository.java | 0
.../src/main/resources/application-dev.yml | 0
.../src/main/resources/application-prod.yml | 0
.../src/main/resources/application.yml | 0
.../src/main/resources/logback.xml | 2 +-
examples/pom.xml | 6 +++---
28 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/examples/elasticjob-example-lite-java/pom.xml
b/examples/elasticjob-example-java/pom.xml
similarity index 98%
rename from examples/elasticjob-example-lite-java/pom.xml
rename to examples/elasticjob-example-java/pom.xml
index e64fd59d3..8a5186c8a 100644
--- a/examples/elasticjob-example-lite-java/pom.xml
+++ b/examples/elasticjob-example-java/pom.xml
@@ -25,7 +25,7 @@
<artifactId>elasticjob-example</artifactId>
<version>${revision}</version>
</parent>
- <artifactId>elasticjob-example-lite-java</artifactId>
+ <artifactId>elasticjob-example-java</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
similarity index 99%
rename from
examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
rename to
examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
index d8cc2bbae..c7f6d4935 100644
---
a/examples/elasticjob-example-lite-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
+++
b/examples/elasticjob-example-java/src/main/java/org/apache/shardingsphere/elasticjob/example/JavaMain.java
@@ -48,7 +48,7 @@ public final class JavaMain {
private static final String ZOOKEEPER_CONNECTION_STRING = "localhost:" +
EMBED_ZOOKEEPER_PORT;
- private static final String JOB_NAMESPACE = "elasticjob-example-lite-java";
+ private static final String JOB_NAMESPACE = "elasticjob-example-java";
// switch to MySQL by yourself
// private static final String EVENT_RDB_STORAGE_DRIVER =
"com.mysql.cj.jdbc.Driver";
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/logback.xml
b/examples/elasticjob-example-java/src/main/resources/logback.xml
similarity index 95%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/logback.xml
rename to examples/elasticjob-example-java/src/main/resources/logback.xml
index 64ecc5a97..133a8717b 100644
--- a/examples/elasticjob-example-lite-spring/src/main/resources/logback.xml
+++ b/examples/elasticjob-example-java/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
- <property name="log.context.name" value="elasticjob-example-lite" />
+ <property name="log.context.name" value="elasticjob-example" />
<property name="log.charset" value="UTF-8" />
<property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
diff --git
a/examples/elasticjob-example-lite-java/src/main/resources/script/demo.bat
b/examples/elasticjob-example-java/src/main/resources/script/demo.bat
similarity index 100%
rename from
examples/elasticjob-example-lite-java/src/main/resources/script/demo.bat
rename to examples/elasticjob-example-java/src/main/resources/script/demo.bat
diff --git
a/examples/elasticjob-example-lite-java/src/main/resources/script/demo.sh
b/examples/elasticjob-example-java/src/main/resources/script/demo.sh
similarity index 100%
rename from
examples/elasticjob-example-lite-java/src/main/resources/script/demo.sh
rename to examples/elasticjob-example-java/src/main/resources/script/demo.sh
diff --git a/examples/elasticjob-example-lite-spring/pom.xml
b/examples/elasticjob-example-spring/pom.xml
similarity index 98%
rename from examples/elasticjob-example-lite-spring/pom.xml
rename to examples/elasticjob-example-spring/pom.xml
index 4f3b2043f..bdba0392f 100644
--- a/examples/elasticjob-example-lite-spring/pom.xml
+++ b/examples/elasticjob-example-spring/pom.xml
@@ -25,7 +25,7 @@
<artifactId>elasticjob-example</artifactId>
<version>${revision}</version>
</parent>
- <artifactId>elasticjob-example-lite-spring</artifactId>
+ <artifactId>elasticjob-example-spring</artifactId>
<name>${project.artifactId}</name>
<dependencies>
diff --git
a/examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java
b/examples/elasticjob-example-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java
similarity index 100%
rename from
examples/elasticjob-example-lite-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java
rename to
examples/elasticjob-example-spring/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringMain.java
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
b/examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
similarity index 100%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
rename to
examples/elasticjob-example-spring/src/main/resources/META-INF/application-context.xml
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
b/examples/elasticjob-example-spring/src/main/resources/conf/job.properties
similarity index 98%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
rename to
examples/elasticjob-example-spring/src/main/resources/conf/job.properties
index 3a5d8dbba..d825ade30 100644
---
a/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
+++ b/examples/elasticjob-example-spring/src/main/resources/conf/job.properties
@@ -45,7 +45,7 @@ dataflow.overwrite=true
script.id=springScriptJob
# need absolute path
-script.scriptCommandLine=your_path/elasticjob/elasticjob-example/elasticjob-example-lite-spring/src/main/resources/script/demo.sh
+script.scriptCommandLine=your_path/elasticjob/elasticjob-example/elasticjob-example-spring/src/main/resources/script/demo.sh
script.cron=0/5 * * * * ?
script.shardingTotalCount=3
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/conf/reg.properties
b/examples/elasticjob-example-spring/src/main/resources/conf/reg.properties
similarity index 95%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/conf/reg.properties
rename to
examples/elasticjob-example-spring/src/main/resources/conf/reg.properties
index d572bdc04..71795b3fe 100644
---
a/examples/elasticjob-example-lite-spring/src/main/resources/conf/reg.properties
+++ b/examples/elasticjob-example-spring/src/main/resources/conf/reg.properties
@@ -16,7 +16,7 @@
#
serverLists=localhost:5181
-namespace=elasticjob-example-lite-spring
+namespace=elasticjob-example-spring
baseSleepTimeMilliseconds=1000
maxSleepTimeMilliseconds=3000
maxRetries=3
diff --git
a/examples/elasticjob-example-lite-java/src/main/resources/logback.xml
b/examples/elasticjob-example-spring/src/main/resources/logback.xml
similarity index 95%
rename from examples/elasticjob-example-lite-java/src/main/resources/logback.xml
rename to examples/elasticjob-example-spring/src/main/resources/logback.xml
index 64ecc5a97..133a8717b 100644
--- a/examples/elasticjob-example-lite-java/src/main/resources/logback.xml
+++ b/examples/elasticjob-example-spring/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
- <property name="log.context.name" value="elasticjob-example-lite" />
+ <property name="log.context.name" value="elasticjob-example" />
<property name="log.charset" value="UTF-8" />
<property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/script/demo.bat
b/examples/elasticjob-example-spring/src/main/resources/script/demo.bat
similarity index 100%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/script/demo.bat
rename to examples/elasticjob-example-spring/src/main/resources/script/demo.bat
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/script/demo.sh
b/examples/elasticjob-example-spring/src/main/resources/script/demo.sh
similarity index 100%
rename from
examples/elasticjob-example-lite-spring/src/main/resources/script/demo.sh
rename to examples/elasticjob-example-spring/src/main/resources/script/demo.sh
diff --git a/examples/elasticjob-example-lite-springboot/pom.xml
b/examples/elasticjob-example-springboot/pom.xml
similarity index 98%
rename from examples/elasticjob-example-lite-springboot/pom.xml
rename to examples/elasticjob-example-springboot/pom.xml
index 125be9b2e..f7c39a0b5 100644
--- a/examples/elasticjob-example-lite-springboot/pom.xml
+++ b/examples/elasticjob-example-springboot/pom.xml
@@ -25,7 +25,7 @@
<artifactId>elasticjob-example</artifactId>
<version>${revision}</version>
</parent>
- <artifactId>elasticjob-example-lite-springboot</artifactId>
+ <artifactId>elasticjob-example-springboot</artifactId>
<name>${project.artifactId}</name>
<properties>
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/SpringBootMain.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/controller/OneOffJobController.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/entity/Foo.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootDataflowJob.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeEmailJob.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootOccurErrorNoticeWechatJob.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/job/SpringBootSimpleJob.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java
b/examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java
rename to
examples/elasticjob-example-springboot/src/main/java/org/apache/shardingsphere/elasticjob/example/repository/FooRepository.java
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/resources/application-dev.yml
b/examples/elasticjob-example-springboot/src/main/resources/application-dev.yml
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/resources/application-dev.yml
rename to
examples/elasticjob-example-springboot/src/main/resources/application-dev.yml
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/resources/application-prod.yml
b/examples/elasticjob-example-springboot/src/main/resources/application-prod.yml
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/resources/application-prod.yml
rename to
examples/elasticjob-example-springboot/src/main/resources/application-prod.yml
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
b/examples/elasticjob-example-springboot/src/main/resources/application.yml
similarity index 100%
rename from
examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
rename to
examples/elasticjob-example-springboot/src/main/resources/application.yml
diff --git
a/examples/elasticjob-example-lite-springboot/src/main/resources/logback.xml
b/examples/elasticjob-example-springboot/src/main/resources/logback.xml
similarity index 95%
rename from
examples/elasticjob-example-lite-springboot/src/main/resources/logback.xml
rename to examples/elasticjob-example-springboot/src/main/resources/logback.xml
index 64ecc5a97..133a8717b 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/resources/logback.xml
+++ b/examples/elasticjob-example-springboot/src/main/resources/logback.xml
@@ -18,7 +18,7 @@
<configuration>
- <property name="log.context.name" value="elasticjob-example-lite" />
+ <property name="log.context.name" value="elasticjob-example" />
<property name="log.charset" value="UTF-8" />
<property name="log.pattern" value="[%-5level] %date --%thread-- [%logger]
%msg %n" />
diff --git a/examples/pom.xml b/examples/pom.xml
index 15918249c..35960d578 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -30,9 +30,9 @@
<module>elasticjob-example-jobs</module>
<module>elasticjob-example-embed-zk</module>
- <module>elasticjob-example-lite-java</module>
- <module>elasticjob-example-lite-spring</module>
- <module>elasticjob-example-lite-springboot</module>
+ <module>elasticjob-example-java</module>
+ <module>elasticjob-example-spring</module>
+ <module>elasticjob-example-springboot</module>
</modules>
<properties>
