Refactor elasticjob-spring module

apache · Oct 15, 2023 · cf74040 · cf74040
1 parent 99f87a3
commit cf74040
Show file tree

Hide file tree

Showing 135 changed files with 238 additions and 238 deletions.
diff --git a/distribution/bin/pom.xml b/distribution/bin/pom.xml
@@ -35,12 +35,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-engine-spring-namespace</artifactId>
+            <artifactId>elasticjob-spring-namespace</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+            <artifactId>elasticjob-spring-boot-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/docs/content/user-manual/configuration/spring-boot-starter.cn.md b/docs/content/user-manual/configuration/spring-boot-starter.cn.md
@@ -4,12 +4,12 @@ weight = 2
 chapter = true
 +++
 
-使用 Spring-boot 需在 pom.xml 文件中添加 elasticjob-engine-spring-boot-starter 模块的依赖。
+使用 Spring-boot 需在 pom.xml 文件中添加 elasticjob-spring-boot-starter 模块的依赖。
 
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+    <artifactId>elasticjob-spring-boot-starter</artifactId>
     <version>${latest.release.version}</version>
 </dependency>
 ```
@@ -38,12 +38,12 @@ chapter = true
 elasticjob:
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
 ```
 
 **Properties**
 ```
-elasticjob.reg-center.namespace=elasticjob-engine-springboot
+elasticjob.reg-center.namespace=elasticjob-springboot
 elasticjob.reg-center.server-lists=localhost:6181
 ```
 

diff --git a/docs/content/user-manual/configuration/spring-boot-starter.en.md b/docs/content/user-manual/configuration/spring-boot-starter.en.md
@@ -4,12 +4,12 @@ weight = 2
 chapter = true
 +++
 
-To use the Spring boot, user need to add the dependency of the `elasticjob-engine-spring-boot-starter` module in the `pom.xml` file.
+To use the Spring boot, user need to add the dependency of the `elasticjob-spring-boot-starter` module in the `pom.xml` file.
 
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+    <artifactId>elasticjob-spring-boot-starter</artifactId>
     <version>${latest.release.version}</version>
 </dependency>
 ```
@@ -38,12 +38,12 @@ Reference:
 elasticjob:
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
 ```
 
 **Properties**
 ```
-elasticjob.reg-center.namespace=elasticjob-engine-springboot
+elasticjob.reg-center.namespace=elasticjob-springboot
 elasticjob.reg-center.server-lists=localhost:6181
 ```
 

diff --git a/docs/content/user-manual/configuration/spring-namespace.cn.md b/docs/content/user-manual/configuration/spring-namespace.cn.md
@@ -4,12 +4,12 @@ weight = 3
 chapter = true
 +++
 
-使用 Spring 命名空间需在 pom.xml 文件中添加 elasticjob-engine-spring 模块的依赖。
+使用 Spring 命名空间需在 pom.xml 文件中添加 elasticjob-spring 模块的依赖。
 
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-namespace</artifactId>
+    <artifactId>elasticjob-spring-namespace</artifactId>
     <version>${latest.release.version}</version>
 </dependency>
 ```

diff --git a/docs/content/user-manual/configuration/spring-namespace.en.md b/docs/content/user-manual/configuration/spring-namespace.en.md
@@ -4,12 +4,12 @@ weight = 2
 chapter = true
 +++
 
-To use the Spring namespace, user need to add the dependency of the `elasticjob-engine-spring` module in the `pom.xml` file.
+To use the Spring namespace, user need to add the dependency of the `elasticjob-spring` module in the `pom.xml` file.
 
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-namespace</artifactId>
+    <artifactId>elasticjob-spring-namespace</artifactId>
     <version>${latest.release.version}</version>
 </dependency>
 ```

diff --git a/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md b/docs/content/user-manual/usage/job-api/spring-boot-starter.cn.md
@@ -48,7 +48,7 @@ Starter 会根据该配置自动创建 `OneOffJobBootstrap` 或 `ScheduleJobBoot
 elasticjob:
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
   jobs:
     dataflowJob:
       elasticJobClass: org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob

diff --git a/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md b/docs/content/user-manual/usage/job-api/spring-boot-starter.en.md
@@ -49,7 +49,7 @@ Configuration reference:
 elasticjob:
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
   jobs:
     dataflowJob:
       elasticJobClass: org.apache.shardingsphere.elasticjob.dataflow.job.DataflowJob

diff --git a/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md b/docs/content/user-manual/usage/tracing/spring-boot-starter.cn.md
@@ -37,5 +37,5 @@ elasticjob:
 
 ## 作业启动
 
-指定事件追踪数据源类型为 RDB，TracingConfiguration 会自动注册到容器中，如果与 elasticjob-engine-spring-boot-starter 配合使用，
+指定事件追踪数据源类型为 RDB，TracingConfiguration 会自动注册到容器中，如果与 elasticjob-spring-boot-starter 配合使用，
 开发者无需进行其他额外的操作，作业启动器会自动使用创建的 TracingConfiguration。
diff --git a/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md b/docs/content/user-manual/usage/tracing/spring-boot-starter.en.md
@@ -38,5 +38,5 @@ elasticjob:
 ## Job Start
 
 TracingConfiguration will be registered into the IoC container imperceptibly after setting tracing type to RDB.
-If elasticjob-engine-spring-boot-starter was imported, developers need to do nothing else. 
+If elasticjob-spring-boot-starter was imported, developers need to do nothing else. 
 The instances of JobBootstrap will use the TracingConfiguration automatically.
diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.cn.md b/docs/content/user-manual/usage/tracing/spring-namespace.cn.md
@@ -6,12 +6,12 @@ chapter = true
 
 ## 引入 Maven 依赖
 
-引入 elasticjob-engine-spring
+引入 elasticjob-spring
 
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-namespace</artifactId>
+    <artifactId>elasticjob-spring-namespace</artifactId>
     <version>${elasticjob.latest.version}</version>
 </dependency>
 ```

diff --git a/docs/content/user-manual/usage/tracing/spring-namespace.en.md b/docs/content/user-manual/usage/tracing/spring-namespace.en.md
@@ -9,7 +9,7 @@ chapter = true
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-namespace</artifactId>
+    <artifactId>elasticjob-spring-namespace</artifactId>
     <version>${elasticjob.latest.version}</version>
 </dependency>
 ```

diff --git a/examples/elasticjob-example-lite-spring/pom.xml b/examples/elasticjob-example-lite-spring/pom.xml
@@ -57,7 +57,7 @@
 
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-engine-spring-namespace</artifactId>
+            <artifactId>elasticjob-spring-namespace</artifactId>
         </dependency>
 
         <dependency>

diff --git a/examples/elasticjob-example-lite-springboot/pom.xml b/examples/elasticjob-example-lite-springboot/pom.xml
@@ -46,7 +46,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+            <artifactId>elasticjob-spring-boot-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

diff --git a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
@@ -7,7 +7,7 @@ elasticjob:
     type: RDB
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
   jobs:
     simpleJob:
       elasticJobClass: org.apache.shardingsphere.elasticjob.engine.example.job.SpringBootSimpleJob

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -63,7 +63,7 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.shardingsphere.elasticjob</groupId>
-                <artifactId>elasticjob-engine-spring-namespace</artifactId>
+                <artifactId>elasticjob-spring-namespace</artifactId>
                 <version>${revision}</version>
             </dependency>
 

diff --git a/spring/boot-starter/README.md b/spring/boot-starter/README.md
@@ -7,7 +7,7 @@
 ```xml
 <dependency>
     <groupId>org.apache.shardingsphere.elasticjob</groupId>
-    <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+    <artifactId>elasticjob-spring-boot-starter</artifactId>
     <version>${latest.version}</version>
 </dependency>
 ```
@@ -52,7 +52,7 @@ elasticjob:
     type: RDB
   regCenter:
     serverLists: localhost:6181
-    namespace: elasticjob-engine-springboot
+    namespace: elasticjob-springboot
   jobs:
     classed:
       org.apache.shardingsphere.elasticjob.simple.job.SimpleJob:

diff --git a/spring/boot-starter/pom.xml b/spring/boot-starter/pom.xml
@@ -20,16 +20,16 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-engine-spring</artifactId>
+        <artifactId>elasticjob-spring</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
-    <artifactId>elasticjob-engine-spring-boot-starter</artifactId>
+    <artifactId>elasticjob-spring-boot-starter</artifactId>
     <name>${project.artifactId}</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.shardingsphere.elasticjob</groupId>
-            <artifactId>elasticjob-engine-spring-core</artifactId>
+            <artifactId>elasticjob-spring-core</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
 

diff --git a/...job/ElasticJobBootstrapConfiguration.java → ...job/ElasticJobBootstrapConfiguration.java b/...job/ElasticJobBootstrapConfiguration.java → ...job/ElasticJobBootstrapConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.job;
+package org.apache.shardingsphere.elasticjob.spring.boot.job;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
@@ -25,7 +25,7 @@
 import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
 import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.OneOffJobBootstrap;
 import org.apache.shardingsphere.elasticjob.engine.api.bootstrap.impl.ScheduleJobBootstrap;
-import org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing.TracingProperties;
+import org.apache.shardingsphere.elasticjob.spring.boot.tracing.TracingProperties;
 import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
 import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
 import org.springframework.beans.factory.BeanCreationException;

diff --git a/...ob/ElasticJobConfigurationProperties.java → ...ob/ElasticJobConfigurationProperties.java b/...ob/ElasticJobConfigurationProperties.java → ...ob/ElasticJobConfigurationProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.job;
+package org.apache.shardingsphere.elasticjob.spring.boot.job;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../job/ElasticJobLiteAutoConfiguration.java → .../job/ElasticJobLiteAutoConfiguration.java b/.../job/ElasticJobLiteAutoConfiguration.java → .../job/ElasticJobLiteAutoConfiguration.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.job;
+package org.apache.shardingsphere.elasticjob.spring.boot.job;
 
-import org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.ElasticJobRegistryCenterConfiguration;
-import org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot.ElasticJobSnapshotServiceConfiguration;
-import org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing.ElasticJobTracingConfiguration;
+import org.apache.shardingsphere.elasticjob.spring.boot.reg.ElasticJobRegistryCenterConfiguration;
+import org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot.ElasticJobSnapshotServiceConfiguration;
+import org.apache.shardingsphere.elasticjob.spring.boot.tracing.ElasticJobTracingConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;

diff --git a/...spring/boot/job/ElasticJobProperties.java → ...spring/boot/job/ElasticJobProperties.java b/...spring/boot/job/ElasticJobProperties.java → ...spring/boot/job/ElasticJobProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.job;
+package org.apache.shardingsphere.elasticjob.spring.boot.job;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ob/ScheduleJobBootstrapStartupRunner.java → ...ob/ScheduleJobBootstrapStartupRunner.java b/...ob/ScheduleJobBootstrapStartupRunner.java → ...ob/ScheduleJobBootstrapStartupRunner.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.job;
+package org.apache.shardingsphere.elasticjob.spring.boot.job;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...lasticJobRegistryCenterConfiguration.java → ...lasticJobRegistryCenterConfiguration.java b/...lasticJobRegistryCenterConfiguration.java → ...lasticJobRegistryCenterConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg;
+package org.apache.shardingsphere.elasticjob.spring.boot.reg;
 
 import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/.../spring/boot/reg/ZookeeperProperties.java → .../spring/boot/reg/ZookeeperProperties.java b/.../spring/boot/reg/ZookeeperProperties.java → .../spring/boot/reg/ZookeeperProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg;
+package org.apache.shardingsphere.elasticjob.spring.boot.reg;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...asticJobSnapshotServiceConfiguration.java → ...asticJobSnapshotServiceConfiguration.java b/...asticJobSnapshotServiceConfiguration.java → ...asticJobSnapshotServiceConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot;
+package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot;
 
 import org.apache.shardingsphere.elasticjob.engine.internal.snapshot.SnapshotService;
 import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;

diff --git a/...g/snapshot/SnapshotServiceProperties.java → ...g/snapshot/SnapshotServiceProperties.java b/...g/snapshot/SnapshotServiceProperties.java → ...g/snapshot/SnapshotServiceProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.reg.snapshot;
+package org.apache.shardingsphere.elasticjob.spring.boot.reg.snapshot;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...acing/ElasticJobTracingConfiguration.java → ...acing/ElasticJobTracingConfiguration.java b/...acing/ElasticJobTracingConfiguration.java → ...acing/ElasticJobTracingConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing;
+package org.apache.shardingsphere.elasticjob.spring.boot.tracing;
 
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;

diff --git a/...pring/boot/tracing/TracingProperties.java → ...pring/boot/tracing/TracingProperties.java b/...pring/boot/tracing/TracingProperties.java → ...pring/boot/tracing/TracingProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.elasticjob.engine.spring.boot.tracing;
+package org.apache.shardingsphere.elasticjob.spring.boot.tracing;
 
 import lombok.Getter;
 import lombok.Setter;