diff --git a/README.md b/README.md index 3bcd40ed5..ec5c25d95 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ LTS 轻量级分布式任务调度框架(Light Task Schedule) ## 框架概况： LTS是一个轻量级分布式任务调度框架，参考hadoop的部分思想。有三种角色, JobClient, JobTracker, TaskTracker。各个节点都是无状态的，可以部署多个，来实现负载均衡，实现更大的负载量, 并且框架具有很好的容错能力。 - 采用多种注册中心（Zookeeper，redis等）进行节点信息暴露，master选举。Mongo存储任务队列和任务执行日志, netty做底层通信。 + 采用多种注册中心（Zookeeper，redis等）进行节点信息暴露，master选举。(Mongo or Mysql)存储任务队列和任务执行日志, netty做底层通信。 * JobClient : 主要负责提交任务, 和 接收任务执行反馈结果。 * JobTracker : 负责接收并分配任务，任务调度。 * TaskTracker: 负责执行任务，执行完反馈给JobTracker。 @@ -11,7 +11,7 @@ LTS 轻量级分布式任务调度框架(Light Task Schedule) 框架支持实时任务，也支持定时任务，同时也支持CronExpression, 有问题，请加QQ群：109500214 一起完善，探讨 ##架构图 -![Aaron Swartz](https://raw.githubusercontent.com/qq254963746/light-task-schedule/master/data/%E6%9E%B6%E6%9E%84%E5%9B%BE.png) +![Aaron Swartz](https://raw.githubusercontent.com/qq254963746/light-task-schedule/master/doc/%E6%9E%B6%E6%9E%84%E5%9B%BE.png) ##节点组: * 1. 一个节点组等同于一个集群，同一个节点组中的各个节点是对等的，外界无论连接节点组中的任务一个节点都是可以的。 * 2. 每个节点组中都有一个master节点(master宕机，会自动选举出新的master节点)，框架会提供接口API来监听master节点的变化，用户可以自己使用master节点做自己想做的事情。 @@ -23,7 +23,7 @@ LTS 轻量级分布式任务调度框架(Light Task Schedule) * 1. JobClient 提交一个 任务 给 JobTracker, 这里我提供了两种客户端API, 一种是如果JobTracker 不存在或者提交失败，直接返回提交失败。另一种客户端是重试客户端, 如果提交失败，先存储到本地leveldb(可以使用NFS来达到同个节点组共享leveldb文件的目的,多线程访问，做了文件锁处理)，返回给客户端提交成功的信息，待JobTracker可用的时候，再将任务提交。 * 2. JobTracker 收到JobClient提交来的任务，先生成一个唯一的JobID。然后将任务储存在Mongo集群中。JobTracker 发现有（任务执行的）可用的TaskTracker节点(组) 之后，将优先级最大，最先提交的任务分发给TaskTracker。这里JobTracker会优先分配给比较空闲的TaskTracker节点，达到负载均衡。 * 3. TaskTracker 收到JobTracker分发来的任务之后，执行。执行完毕之后，再反馈任务执行结果给JobTracker（成功or 失败[失败有失败错误信息]），如果发现JobTacker不可用，那么存储本地leveldb，等待TaskTracker可用的时候再反馈。反馈结果的同时，询问JobTacker有没有新的任务要执行。 -* 4. JobTacker收到TaskTracker节点的任务结果信息，生成并插入(mongo)任务执行日志。根据任务信息决定要不要反馈给客户端。不需要反馈的直接删除, 需要反馈的（同样JobClient不可用存储文件，等待可用重发）。 +* 4. JobTacker收到TaskTracker节点的任务结果信息，生成并插入(mongo or mysql)任务执行日志。根据任务信息决定要不要反馈给客户端。不需要反馈的直接删除, 需要反馈的（同样JobClient不可用存储文件，等待可用重发）。 * 5. JobClient 收到任务执行结果，进行自己想要的逻辑处理。 ## 特性 diff --git a/data/mongo/mongo.md b/data/mongo/mongo.md deleted file mode 100644 index ec375b213..000000000 --- a/data/mongo/mongo.md +++ /dev/null @@ -1,25 +0,0 @@ - - - -use job; -db.createCollection("JobPo"); -db.JobPo.ensureIndex({"jobId":1},{unique:true}); -db.JobPo.ensureIndex({"taskTrackerNodeGroup":1, "taskId":1},{unique:true}); -db.JobPo.ensureIndex({"taskTrackerIdentity":1}); -db.JobPo.ensureIndex({"triggerTime":1, "priority":1, "gmtCreated": 1}); -db.JobPo.ensureIndex({"isRunning":1}); -db.JobPo.ensureIndex({"taskTrackerNodeGroup":1, "isRunning":1, "triggerTime":1}); - -db.createCollection("JobLogPo"); -db.JobLogPo.ensureIndex({"jobId":1}); -db.JobLogPo.ensureIndex({"submitNodeGroup":1, "taskId":1}); -db.JobLogPo.ensureIndex({"taskTrackerIdentity":1}); -db.JobLogPo.ensureIndex({"gmtCreated":1}); -db.JobLogPo.ensureIndex({"priority":1}); -db.JobLogPo.ensureIndex({"logType":1}); -db.JobLogPo.ensureIndex({"timestamp":1}); -db.JobLogPo.ensureIndex({"taskId":1}); - -db.createCollection("JobFeedbackPo"); -db.JobFeedbackPo.ensureIndex({"id":1}); -db.JobFeedbackPo.ensureIndex({"gmtCreatedd":1}); diff --git "a/data/\346\236\266\346\236\204\345\233\276.png" "b/doc/\346\236\266\346\236\204\345\233\276.png" similarity index 100% rename from "data/\346\236\266\346\236\204\345\233\276.png" rename to "doc/\346\236\266\346\236\204\345\233\276.png" diff --git a/job-example/.DS_Store b/job-example/.DS_Store deleted file mode 100644 index 6618cb039..000000000 Binary files a/job-example/.DS_Store and /dev/null differ diff --git a/job-admin/pom.xml b/lts-admin/pom.xml similarity index 93% rename from job-admin/pom.xml rename to lts-admin/pom.xml index b60fe3b95..0c0778f4b 100644 --- a/job-admin/pom.xml +++ b/lts-admin/pom.xml @@ -3,13 +3,13 @@ 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"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 war - job-admin + lts-admin 3.2.4.RELEASE @@ -35,7 +35,7 @@ com.lts - job-core + lts-core ${project.version} diff --git a/job-admin/src/main/java/com/lts/job/web/controller/AbstractController.java b/lts-admin/src/main/java/com/lts/job/web/controller/AbstractController.java similarity index 100% rename from job-admin/src/main/java/com/lts/job/web/controller/AbstractController.java rename to lts-admin/src/main/java/com/lts/job/web/controller/AbstractController.java diff --git a/job-admin/src/main/java/com/lts/job/web/controller/NodeController.java b/lts-admin/src/main/java/com/lts/job/web/controller/NodeController.java similarity index 100% rename from job-admin/src/main/java/com/lts/job/web/controller/NodeController.java rename to lts-admin/src/main/java/com/lts/job/web/controller/NodeController.java diff --git a/job-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java b/lts-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java similarity index 99% rename from job-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java rename to lts-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java index 17cf9f06c..4378c1ace 100644 --- a/job-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java +++ b/lts-admin/src/main/java/com/lts/job/web/support/AppConfigurer.java @@ -1,5 +1,7 @@ package com.lts.job.web.support; +import java.util.*; + /** * @author Robert HG (254963746@qq.com) on 5/11/15. */ diff --git a/job-admin/src/main/java/com/lts/job/web/support/node/NodeManager.java b/lts-admin/src/main/java/com/lts/job/web/support/node/NodeManager.java similarity index 100% rename from job-admin/src/main/java/com/lts/job/web/support/node/NodeManager.java rename to lts-admin/src/main/java/com/lts/job/web/support/node/NodeManager.java diff --git a/job-admin/src/main/java/com/lts/job/web/support/node/ZkNodeManager.java b/lts-admin/src/main/java/com/lts/job/web/support/node/ZkNodeManager.java similarity index 100% rename from job-admin/src/main/java/com/lts/job/web/support/node/ZkNodeManager.java rename to lts-admin/src/main/java/com/lts/job/web/support/node/ZkNodeManager.java diff --git a/job-admin/src/main/resources/config.properties b/lts-admin/src/main/resources/config.properties similarity index 100% rename from job-admin/src/main/resources/config.properties rename to lts-admin/src/main/resources/config.properties diff --git a/job-admin/src/main/resources/spring-servlet.xml b/lts-admin/src/main/resources/spring-servlet.xml similarity index 100% rename from job-admin/src/main/resources/spring-servlet.xml rename to lts-admin/src/main/resources/spring-servlet.xml diff --git a/lts-admin/src/main/webapp/WEB-INF/web.xml b/lts-admin/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000..2d9eff8aa --- /dev/null +++ b/lts-admin/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,10 @@ + + + + LTS Admin + + diff --git a/job-core/pom.xml b/lts-core/pom.xml similarity index 96% rename from job-core/pom.xml rename to lts-core/pom.xml index 3abbadc1d..7f7eb8346 100644 --- a/job-core/pom.xml +++ b/lts-core/pom.xml @@ -3,13 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 jar - job-core + lts-core diff --git a/job-core/src/main/java/com/lts/job/core/Application.java b/lts-core/src/main/java/com/lts/job/core/Application.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/Application.java rename to lts-core/src/main/java/com/lts/job/core/Application.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/AbstractClientNode.java b/lts-core/src/main/java/com/lts/job/core/cluster/AbstractClientNode.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/AbstractClientNode.java rename to lts-core/src/main/java/com/lts/job/core/cluster/AbstractClientNode.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java b/lts-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java rename to lts-core/src/main/java/com/lts/job/core/cluster/AbstractJobNode.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/AbstractServerNode.java b/lts-core/src/main/java/com/lts/job/core/cluster/AbstractServerNode.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/AbstractServerNode.java rename to lts-core/src/main/java/com/lts/job/core/cluster/AbstractServerNode.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/Config.java b/lts-core/src/main/java/com/lts/job/core/cluster/Config.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/Config.java rename to lts-core/src/main/java/com/lts/job/core/cluster/Config.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/JobNode.java b/lts-core/src/main/java/com/lts/job/core/cluster/JobNode.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/JobNode.java rename to lts-core/src/main/java/com/lts/job/core/cluster/JobNode.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java b/lts-core/src/main/java/com/lts/job/core/cluster/MasterElector.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/MasterElector.java rename to lts-core/src/main/java/com/lts/job/core/cluster/MasterElector.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/Node.java b/lts-core/src/main/java/com/lts/job/core/cluster/Node.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/Node.java rename to lts-core/src/main/java/com/lts/job/core/cluster/Node.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/NodeType.java b/lts-core/src/main/java/com/lts/job/core/cluster/NodeType.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/NodeType.java rename to lts-core/src/main/java/com/lts/job/core/cluster/NodeType.java diff --git a/job-core/src/main/java/com/lts/job/core/cluster/SubscribedNodeManager.java b/lts-core/src/main/java/com/lts/job/core/cluster/SubscribedNodeManager.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/cluster/SubscribedNodeManager.java rename to lts-core/src/main/java/com/lts/job/core/cluster/SubscribedNodeManager.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/Compiler.java b/lts-core/src/main/java/com/lts/job/core/compiler/Compiler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/Compiler.java rename to lts-core/src/main/java/com/lts/job/core/compiler/Compiler.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/package-info.java b/lts-core/src/main/java/com/lts/job/core/compiler/package-info.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/package-info.java rename to lts-core/src/main/java/com/lts/job/core/compiler/package-info.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/support/AbstractCompiler.java b/lts-core/src/main/java/com/lts/job/core/compiler/support/AbstractCompiler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/support/AbstractCompiler.java rename to lts-core/src/main/java/com/lts/job/core/compiler/support/AbstractCompiler.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/support/AdaptiveCompiler.java b/lts-core/src/main/java/com/lts/job/core/compiler/support/AdaptiveCompiler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/support/AdaptiveCompiler.java rename to lts-core/src/main/java/com/lts/job/core/compiler/support/AdaptiveCompiler.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/support/ClassUtils.java b/lts-core/src/main/java/com/lts/job/core/compiler/support/ClassUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/support/ClassUtils.java rename to lts-core/src/main/java/com/lts/job/core/compiler/support/ClassUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/support/JavassistCompiler.java b/lts-core/src/main/java/com/lts/job/core/compiler/support/JavassistCompiler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/support/JavassistCompiler.java rename to lts-core/src/main/java/com/lts/job/core/compiler/support/JavassistCompiler.java diff --git a/job-core/src/main/java/com/lts/job/core/compiler/support/JdkCompiler.java b/lts-core/src/main/java/com/lts/job/core/compiler/support/JdkCompiler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/compiler/support/JdkCompiler.java rename to lts-core/src/main/java/com/lts/job/core/compiler/support/JdkCompiler.java diff --git a/job-core/src/main/java/com/lts/job/core/constant/Constants.java b/lts-core/src/main/java/com/lts/job/core/constant/Constants.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/constant/Constants.java rename to lts-core/src/main/java/com/lts/job/core/constant/Constants.java diff --git a/job-core/src/main/java/com/lts/job/core/constant/EcTopic.java b/lts-core/src/main/java/com/lts/job/core/constant/EcTopic.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/constant/EcTopic.java rename to lts-core/src/main/java/com/lts/job/core/constant/EcTopic.java diff --git a/job-core/src/main/java/com/lts/job/core/constant/Level.java b/lts-core/src/main/java/com/lts/job/core/constant/Level.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/constant/Level.java rename to lts-core/src/main/java/com/lts/job/core/constant/Level.java diff --git a/job-core/src/main/java/com/lts/job/core/domain/Job.java b/lts-core/src/main/java/com/lts/job/core/domain/Job.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/domain/Job.java rename to lts-core/src/main/java/com/lts/job/core/domain/Job.java diff --git a/job-core/src/main/java/com/lts/job/core/domain/JobResult.java b/lts-core/src/main/java/com/lts/job/core/domain/JobResult.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/domain/JobResult.java rename to lts-core/src/main/java/com/lts/job/core/domain/JobResult.java diff --git a/job-core/src/main/java/com/lts/job/core/domain/KVPair.java b/lts-core/src/main/java/com/lts/job/core/domain/KVPair.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/domain/KVPair.java rename to lts-core/src/main/java/com/lts/job/core/domain/KVPair.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/CronException.java b/lts-core/src/main/java/com/lts/job/core/exception/CronException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/CronException.java rename to lts-core/src/main/java/com/lts/job/core/exception/CronException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/JobInfoException.java b/lts-core/src/main/java/com/lts/job/core/exception/JobInfoException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/JobInfoException.java rename to lts-core/src/main/java/com/lts/job/core/exception/JobInfoException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/JobReceiveException.java b/lts-core/src/main/java/com/lts/job/core/exception/JobReceiveException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/JobReceiveException.java rename to lts-core/src/main/java/com/lts/job/core/exception/JobReceiveException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/JobSubmitException.java b/lts-core/src/main/java/com/lts/job/core/exception/JobSubmitException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/JobSubmitException.java rename to lts-core/src/main/java/com/lts/job/core/exception/JobSubmitException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/JobTrackerNotFoundException.java b/lts-core/src/main/java/com/lts/job/core/exception/JobTrackerNotFoundException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/JobTrackerNotFoundException.java rename to lts-core/src/main/java/com/lts/job/core/exception/JobTrackerNotFoundException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/NodeRegistryException.java b/lts-core/src/main/java/com/lts/job/core/exception/NodeRegistryException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/NodeRegistryException.java rename to lts-core/src/main/java/com/lts/job/core/exception/NodeRegistryException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/RemotingSendException.java b/lts-core/src/main/java/com/lts/job/core/exception/RemotingSendException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/RemotingSendException.java rename to lts-core/src/main/java/com/lts/job/core/exception/RemotingSendException.java diff --git a/job-core/src/main/java/com/lts/job/core/exception/RequestTimeoutException.java b/lts-core/src/main/java/com/lts/job/core/exception/RequestTimeoutException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/exception/RequestTimeoutException.java rename to lts-core/src/main/java/com/lts/job/core/exception/RequestTimeoutException.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/Activate.java b/lts-core/src/main/java/com/lts/job/core/extension/Activate.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/Activate.java rename to lts-core/src/main/java/com/lts/job/core/extension/Activate.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/Adaptive.java b/lts-core/src/main/java/com/lts/job/core/extension/Adaptive.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/Adaptive.java rename to lts-core/src/main/java/com/lts/job/core/extension/Adaptive.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/ExtensionFactory.java b/lts-core/src/main/java/com/lts/job/core/extension/ExtensionFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/ExtensionFactory.java rename to lts-core/src/main/java/com/lts/job/core/extension/ExtensionFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/ExtensionLoader.java b/lts-core/src/main/java/com/lts/job/core/extension/ExtensionLoader.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/ExtensionLoader.java rename to lts-core/src/main/java/com/lts/job/core/extension/ExtensionLoader.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/SPI.java b/lts-core/src/main/java/com/lts/job/core/extension/SPI.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/SPI.java rename to lts-core/src/main/java/com/lts/job/core/extension/SPI.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/factory/AdaptiveExtensionFactory.java b/lts-core/src/main/java/com/lts/job/core/extension/factory/AdaptiveExtensionFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/factory/AdaptiveExtensionFactory.java rename to lts-core/src/main/java/com/lts/job/core/extension/factory/AdaptiveExtensionFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/factory/SpiExtensionFactory.java b/lts-core/src/main/java/com/lts/job/core/extension/factory/SpiExtensionFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/factory/SpiExtensionFactory.java rename to lts-core/src/main/java/com/lts/job/core/extension/factory/SpiExtensionFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/extension/package-info.java b/lts-core/src/main/java/com/lts/job/core/extension/package-info.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/extension/package-info.java rename to lts-core/src/main/java/com/lts/job/core/extension/package-info.java diff --git a/job-core/src/main/java/com/lts/job/core/factory/JobNodeConfigFactory.java b/lts-core/src/main/java/com/lts/job/core/factory/JobNodeConfigFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/factory/JobNodeConfigFactory.java rename to lts-core/src/main/java/com/lts/job/core/factory/JobNodeConfigFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/factory/NamedThreadFactory.java b/lts-core/src/main/java/com/lts/job/core/factory/NamedThreadFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/factory/NamedThreadFactory.java rename to lts-core/src/main/java/com/lts/job/core/factory/NamedThreadFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/factory/NodeFactory.java b/lts-core/src/main/java/com/lts/job/core/factory/NodeFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/factory/NodeFactory.java rename to lts-core/src/main/java/com/lts/job/core/factory/NodeFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/FailStore.java b/lts-core/src/main/java/com/lts/job/core/failstore/FailStore.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/FailStore.java rename to lts-core/src/main/java/com/lts/job/core/failstore/FailStore.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/FailStoreException.java b/lts-core/src/main/java/com/lts/job/core/failstore/FailStoreException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/FailStoreException.java rename to lts-core/src/main/java/com/lts/job/core/failstore/FailStoreException.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/FailStoreFactory.java b/lts-core/src/main/java/com/lts/job/core/failstore/FailStoreFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/FailStoreFactory.java rename to lts-core/src/main/java/com/lts/job/core/failstore/FailStoreFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStore.java b/lts-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStore.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStore.java rename to lts-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStore.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreFactory.java b/lts-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreFactory.java rename to lts-core/src/main/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStore.java b/lts-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStore.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStore.java rename to lts-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStore.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStoreFactory.java b/lts-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStoreFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStoreFactory.java rename to lts-core/src/main/java/com/lts/job/core/failstore/leveldb/LeveldbFailStoreFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStore.java b/lts-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStore.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStore.java rename to lts-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStore.java diff --git a/job-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreFactory.java b/lts-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreFactory.java rename to lts-core/src/main/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/file/FileLock.java b/lts-core/src/main/java/com/lts/job/core/file/FileLock.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/file/FileLock.java rename to lts-core/src/main/java/com/lts/job/core/file/FileLock.java diff --git a/job-core/src/main/java/com/lts/job/core/file/FileUtils.java b/lts-core/src/main/java/com/lts/job/core/file/FileUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/file/FileUtils.java rename to lts-core/src/main/java/com/lts/job/core/file/FileUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/listener/MasterChangeListener.java b/lts-core/src/main/java/com/lts/job/core/listener/MasterChangeListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/listener/MasterChangeListener.java rename to lts-core/src/main/java/com/lts/job/core/listener/MasterChangeListener.java diff --git a/job-core/src/main/java/com/lts/job/core/listener/MasterElectionListener.java b/lts-core/src/main/java/com/lts/job/core/listener/MasterElectionListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/listener/MasterElectionListener.java rename to lts-core/src/main/java/com/lts/job/core/listener/MasterElectionListener.java diff --git a/job-core/src/main/java/com/lts/job/core/listener/NodeChangeListener.java b/lts-core/src/main/java/com/lts/job/core/listener/NodeChangeListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/listener/NodeChangeListener.java rename to lts-core/src/main/java/com/lts/job/core/listener/NodeChangeListener.java diff --git a/job-core/src/main/java/com/lts/job/core/listener/SelfChangeListener.java b/lts-core/src/main/java/com/lts/job/core/listener/SelfChangeListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/listener/SelfChangeListener.java rename to lts-core/src/main/java/com/lts/job/core/listener/SelfChangeListener.java diff --git a/job-core/src/main/java/com/lts/job/core/loadbalance/AbstractLoadBalance.java b/lts-core/src/main/java/com/lts/job/core/loadbalance/AbstractLoadBalance.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/loadbalance/AbstractLoadBalance.java rename to lts-core/src/main/java/com/lts/job/core/loadbalance/AbstractLoadBalance.java diff --git a/job-core/src/main/java/com/lts/job/core/loadbalance/ConsistentHashLoadBalance.java b/lts-core/src/main/java/com/lts/job/core/loadbalance/ConsistentHashLoadBalance.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/loadbalance/ConsistentHashLoadBalance.java rename to lts-core/src/main/java/com/lts/job/core/loadbalance/ConsistentHashLoadBalance.java diff --git a/job-core/src/main/java/com/lts/job/core/loadbalance/LoadBalance.java b/lts-core/src/main/java/com/lts/job/core/loadbalance/LoadBalance.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/loadbalance/LoadBalance.java rename to lts-core/src/main/java/com/lts/job/core/loadbalance/LoadBalance.java diff --git a/job-core/src/main/java/com/lts/job/core/loadbalance/RandomLoadBalance.java b/lts-core/src/main/java/com/lts/job/core/loadbalance/RandomLoadBalance.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/loadbalance/RandomLoadBalance.java rename to lts-core/src/main/java/com/lts/job/core/loadbalance/RandomLoadBalance.java diff --git a/job-core/src/main/java/com/lts/job/core/loadbalance/RoundbinLoadBalance.java b/lts-core/src/main/java/com/lts/job/core/loadbalance/RoundbinLoadBalance.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/loadbalance/RoundbinLoadBalance.java rename to lts-core/src/main/java/com/lts/job/core/loadbalance/RoundbinLoadBalance.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/Level.java b/lts-core/src/main/java/com/lts/job/core/logger/Level.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/Level.java rename to lts-core/src/main/java/com/lts/job/core/logger/Level.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/Logger.java b/lts-core/src/main/java/com/lts/job/core/logger/Logger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/Logger.java rename to lts-core/src/main/java/com/lts/job/core/logger/Logger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/LoggerAdapter.java b/lts-core/src/main/java/com/lts/job/core/logger/LoggerAdapter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/LoggerAdapter.java rename to lts-core/src/main/java/com/lts/job/core/logger/LoggerAdapter.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/LoggerFactory.java b/lts-core/src/main/java/com/lts/job/core/logger/LoggerFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/LoggerFactory.java rename to lts-core/src/main/java/com/lts/job/core/logger/LoggerFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/jcl/JclLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/jcl/JclLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/jcl/JclLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/jcl/JclLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/jcl/JclLoggerAdapter.java b/lts-core/src/main/java/com/lts/job/core/logger/jcl/JclLoggerAdapter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/jcl/JclLoggerAdapter.java rename to lts-core/src/main/java/com/lts/job/core/logger/jcl/JclLoggerAdapter.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/jdk/JdkLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/jdk/JdkLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/jdk/JdkLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/jdk/JdkLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/jdk/JdkLoggerAdapter.java b/lts-core/src/main/java/com/lts/job/core/logger/jdk/JdkLoggerAdapter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/jdk/JdkLoggerAdapter.java rename to lts-core/src/main/java/com/lts/job/core/logger/jdk/JdkLoggerAdapter.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLoggerAdapter.java b/lts-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLoggerAdapter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLoggerAdapter.java rename to lts-core/src/main/java/com/lts/job/core/logger/log4j/Log4jLoggerAdapter.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/package-info.java b/lts-core/src/main/java/com/lts/job/core/logger/package-info.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/package-info.java rename to lts-core/src/main/java/com/lts/job/core/logger/package-info.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLoggerAdapter.java b/lts-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLoggerAdapter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLoggerAdapter.java rename to lts-core/src/main/java/com/lts/job/core/logger/slf4j/Slf4jLoggerAdapter.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/support/AbstractLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/support/AbstractLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/support/AbstractLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/support/AbstractLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/support/FailsafeLogger.java b/lts-core/src/main/java/com/lts/job/core/logger/support/FailsafeLogger.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/support/FailsafeLogger.java rename to lts-core/src/main/java/com/lts/job/core/logger/support/FailsafeLogger.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/support/FormattingTuple.java b/lts-core/src/main/java/com/lts/job/core/logger/support/FormattingTuple.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/support/FormattingTuple.java rename to lts-core/src/main/java/com/lts/job/core/logger/support/FormattingTuple.java diff --git a/job-core/src/main/java/com/lts/job/core/logger/support/MessageFormatter.java b/lts-core/src/main/java/com/lts/job/core/logger/support/MessageFormatter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/logger/support/MessageFormatter.java rename to lts-core/src/main/java/com/lts/job/core/logger/support/MessageFormatter.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/JobProtos.java b/lts-core/src/main/java/com/lts/job/core/protocol/JobProtos.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/JobProtos.java rename to lts-core/src/main/java/com/lts/job/core/protocol/JobProtos.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/AbstractCommandBody.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/AbstractCommandBody.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/AbstractCommandBody.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/AbstractCommandBody.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/BizLogSendRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/BizLogSendRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/BizLogSendRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/BizLogSendRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/CommandBodyWrapper.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/CommandBodyWrapper.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/CommandBodyWrapper.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/CommandBodyWrapper.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/HeartBeatRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/HeartBeatRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/HeartBeatRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/HeartBeatRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobAskRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobAskRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobAskRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobAskRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobAskResponse.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobAskResponse.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobAskResponse.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobAskResponse.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobFinishedRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobFinishedRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobFinishedRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobFinishedRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobPullRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobPullRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobPullRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobPullRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobPushRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobPushRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobPushRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobPushRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitRequest.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitRequest.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitRequest.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitRequest.java diff --git a/job-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitResponse.java b/lts-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitResponse.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitResponse.java rename to lts-core/src/main/java/com/lts/job/core/protocol/command/JobSubmitResponse.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/AbstractRegistry.java b/lts-core/src/main/java/com/lts/job/core/registry/AbstractRegistry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/AbstractRegistry.java rename to lts-core/src/main/java/com/lts/job/core/registry/AbstractRegistry.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/FailbackRegistry.java b/lts-core/src/main/java/com/lts/job/core/registry/FailbackRegistry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/FailbackRegistry.java rename to lts-core/src/main/java/com/lts/job/core/registry/FailbackRegistry.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/NodeRegistryUtils.java b/lts-core/src/main/java/com/lts/job/core/registry/NodeRegistryUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/NodeRegistryUtils.java rename to lts-core/src/main/java/com/lts/job/core/registry/NodeRegistryUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/NotifyEvent.java b/lts-core/src/main/java/com/lts/job/core/registry/NotifyEvent.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/NotifyEvent.java rename to lts-core/src/main/java/com/lts/job/core/registry/NotifyEvent.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/NotifyListener.java b/lts-core/src/main/java/com/lts/job/core/registry/NotifyListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/NotifyListener.java rename to lts-core/src/main/java/com/lts/job/core/registry/NotifyListener.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/Registry.java b/lts-core/src/main/java/com/lts/job/core/registry/Registry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/Registry.java rename to lts-core/src/main/java/com/lts/job/core/registry/Registry.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/RegistryFactory.java b/lts-core/src/main/java/com/lts/job/core/registry/RegistryFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/RegistryFactory.java rename to lts-core/src/main/java/com/lts/job/core/registry/RegistryFactory.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/multcast/MulticastRegistry.java b/lts-core/src/main/java/com/lts/job/core/registry/multcast/MulticastRegistry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/multcast/MulticastRegistry.java rename to lts-core/src/main/java/com/lts/job/core/registry/multcast/MulticastRegistry.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/redis/RedisRegistry.java b/lts-core/src/main/java/com/lts/job/core/registry/redis/RedisRegistry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/redis/RedisRegistry.java rename to lts-core/src/main/java/com/lts/job/core/registry/redis/RedisRegistry.java diff --git a/job-core/src/main/java/com/lts/job/core/registry/zookeeper/ZookeeperRegistry.java b/lts-core/src/main/java/com/lts/job/core/registry/zookeeper/ZookeeperRegistry.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/registry/zookeeper/ZookeeperRegistry.java rename to lts-core/src/main/java/com/lts/job/core/registry/zookeeper/ZookeeperRegistry.java diff --git a/job-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java b/lts-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java similarity index 96% rename from job-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java rename to lts-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java index de7b159e7..33d15be83 100644 --- a/job-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java +++ b/lts-core/src/main/java/com/lts/job/core/remoting/HeartBeatMonitor.java @@ -8,9 +8,13 @@ import com.lts.job.core.protocol.JobProtos; import com.lts.job.core.protocol.command.HeartBeatRequest; import com.lts.job.core.util.CollectionUtils; +import com.lts.job.core.util.Holder; +import com.lts.job.remoting.InvokeCallback; +import com.lts.job.remoting.netty.ResponseFuture; import com.lts.job.remoting.protocol.RemotingCommand; import java.util.List; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/job-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java b/lts-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java rename to lts-core/src/main/java/com/lts/job/core/remoting/RemotingClientDelegate.java diff --git a/job-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java b/lts-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java rename to lts-core/src/main/java/com/lts/job/core/remoting/RemotingServerDelegate.java diff --git a/job-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java b/lts-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java rename to lts-core/src/main/java/com/lts/job/core/support/ConsistentHashSelector.java diff --git a/job-core/src/main/java/com/lts/job/core/support/CronExpression.java b/lts-core/src/main/java/com/lts/job/core/support/CronExpression.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/support/CronExpression.java rename to lts-core/src/main/java/com/lts/job/core/support/CronExpression.java diff --git a/job-core/src/main/java/com/lts/job/core/support/RetryScheduler.java b/lts-core/src/main/java/com/lts/job/core/support/RetryScheduler.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/support/RetryScheduler.java rename to lts-core/src/main/java/com/lts/job/core/support/RetryScheduler.java diff --git a/job-core/src/main/java/com/lts/job/core/util/Assert.java b/lts-core/src/main/java/com/lts/job/core/util/Assert.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/Assert.java rename to lts-core/src/main/java/com/lts/job/core/util/Assert.java diff --git a/job-core/src/main/java/com/lts/job/core/util/BatchUtils.java b/lts-core/src/main/java/com/lts/job/core/util/BatchUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/BatchUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/BatchUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/ClassHelper.java b/lts-core/src/main/java/com/lts/job/core/util/ClassHelper.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/ClassHelper.java rename to lts-core/src/main/java/com/lts/job/core/util/ClassHelper.java diff --git a/job-core/src/main/java/com/lts/job/core/util/CollectionUtils.java b/lts-core/src/main/java/com/lts/job/core/util/CollectionUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/CollectionUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/CollectionUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/CommonUtils.java b/lts-core/src/main/java/com/lts/job/core/util/CommonUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/CommonUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/CommonUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/ConcurrentHashSet.java b/lts-core/src/main/java/com/lts/job/core/util/ConcurrentHashSet.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/ConcurrentHashSet.java rename to lts-core/src/main/java/com/lts/job/core/util/ConcurrentHashSet.java diff --git a/job-core/src/main/java/com/lts/job/core/util/DateUtils.java b/lts-core/src/main/java/com/lts/job/core/util/DateUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/DateUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/DateUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/GenericsUtils.java b/lts-core/src/main/java/com/lts/job/core/util/GenericsUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/GenericsUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/GenericsUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/Holder.java b/lts-core/src/main/java/com/lts/job/core/util/Holder.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/Holder.java rename to lts-core/src/main/java/com/lts/job/core/util/Holder.java diff --git a/job-core/src/main/java/com/lts/job/core/util/JSONUtils.java b/lts-core/src/main/java/com/lts/job/core/util/JSONUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/JSONUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/JSONUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/JobQueueUtils.java b/lts-core/src/main/java/com/lts/job/core/util/JobQueueUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/JobQueueUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/JobQueueUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/ListUtils.java b/lts-core/src/main/java/com/lts/job/core/util/ListUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/ListUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/ListUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/Md5Encrypt.java b/lts-core/src/main/java/com/lts/job/core/util/Md5Encrypt.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/Md5Encrypt.java rename to lts-core/src/main/java/com/lts/job/core/util/Md5Encrypt.java diff --git a/job-core/src/main/java/com/lts/job/core/util/NetUtils.java b/lts-core/src/main/java/com/lts/job/core/util/NetUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/NetUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/NetUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/StringUtils.java b/lts-core/src/main/java/com/lts/job/core/util/StringUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/StringUtils.java rename to lts-core/src/main/java/com/lts/job/core/util/StringUtils.java diff --git a/job-core/src/main/java/com/lts/job/core/util/Version.java b/lts-core/src/main/java/com/lts/job/core/util/Version.java similarity index 100% rename from job-core/src/main/java/com/lts/job/core/util/Version.java rename to lts-core/src/main/java/com/lts/job/core/util/Version.java diff --git a/job-core/src/main/java/com/lts/job/ec/EventCenter.java b/lts-core/src/main/java/com/lts/job/ec/EventCenter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/EventCenter.java rename to lts-core/src/main/java/com/lts/job/ec/EventCenter.java diff --git a/job-core/src/main/java/com/lts/job/ec/EventCenterFactory.java b/lts-core/src/main/java/com/lts/job/ec/EventCenterFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/EventCenterFactory.java rename to lts-core/src/main/java/com/lts/job/ec/EventCenterFactory.java diff --git a/job-core/src/main/java/com/lts/job/ec/EventInfo.java b/lts-core/src/main/java/com/lts/job/ec/EventInfo.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/EventInfo.java rename to lts-core/src/main/java/com/lts/job/ec/EventInfo.java diff --git a/job-core/src/main/java/com/lts/job/ec/EventSubscriber.java b/lts-core/src/main/java/com/lts/job/ec/EventSubscriber.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/EventSubscriber.java rename to lts-core/src/main/java/com/lts/job/ec/EventSubscriber.java diff --git a/job-core/src/main/java/com/lts/job/ec/Observer.java b/lts-core/src/main/java/com/lts/job/ec/Observer.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/Observer.java rename to lts-core/src/main/java/com/lts/job/ec/Observer.java diff --git a/job-core/src/main/java/com/lts/job/ec/injvm/InJvmEventCenterFactory.java b/lts-core/src/main/java/com/lts/job/ec/injvm/InJvmEventCenterFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/injvm/InJvmEventCenterFactory.java rename to lts-core/src/main/java/com/lts/job/ec/injvm/InJvmEventCenterFactory.java diff --git a/job-core/src/main/java/com/lts/job/ec/injvm/InjvmEventCenter.java b/lts-core/src/main/java/com/lts/job/ec/injvm/InjvmEventCenter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/ec/injvm/InjvmEventCenter.java rename to lts-core/src/main/java/com/lts/job/ec/injvm/InjvmEventCenter.java diff --git a/job-core/src/main/java/com/lts/job/remoting/ChannelEventListener.java b/lts-core/src/main/java/com/lts/job/remoting/ChannelEventListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/ChannelEventListener.java rename to lts-core/src/main/java/com/lts/job/remoting/ChannelEventListener.java diff --git a/job-core/src/main/java/com/lts/job/remoting/CommandBody.java b/lts-core/src/main/java/com/lts/job/remoting/CommandBody.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/CommandBody.java rename to lts-core/src/main/java/com/lts/job/remoting/CommandBody.java diff --git a/job-core/src/main/java/com/lts/job/remoting/InvokeCallback.java b/lts-core/src/main/java/com/lts/job/remoting/InvokeCallback.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/InvokeCallback.java rename to lts-core/src/main/java/com/lts/job/remoting/InvokeCallback.java diff --git a/job-core/src/main/java/com/lts/job/remoting/RemotingClient.java b/lts-core/src/main/java/com/lts/job/remoting/RemotingClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/RemotingClient.java rename to lts-core/src/main/java/com/lts/job/remoting/RemotingClient.java diff --git a/job-core/src/main/java/com/lts/job/remoting/RemotingServer.java b/lts-core/src/main/java/com/lts/job/remoting/RemotingServer.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/RemotingServer.java rename to lts-core/src/main/java/com/lts/job/remoting/RemotingServer.java diff --git a/job-core/src/main/java/com/lts/job/remoting/annotation/NotNull.java b/lts-core/src/main/java/com/lts/job/remoting/annotation/NotNull.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/annotation/NotNull.java rename to lts-core/src/main/java/com/lts/job/remoting/annotation/NotNull.java diff --git a/job-core/src/main/java/com/lts/job/remoting/annotation/Nullable.java b/lts-core/src/main/java/com/lts/job/remoting/annotation/Nullable.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/annotation/Nullable.java rename to lts-core/src/main/java/com/lts/job/remoting/annotation/Nullable.java diff --git a/job-core/src/main/java/com/lts/job/remoting/common/Pair.java b/lts-core/src/main/java/com/lts/job/remoting/common/Pair.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/common/Pair.java rename to lts-core/src/main/java/com/lts/job/remoting/common/Pair.java diff --git a/job-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java b/lts-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java rename to lts-core/src/main/java/com/lts/job/remoting/common/RemotingHelper.java diff --git a/job-core/src/main/java/com/lts/job/remoting/common/RemotingUtil.java b/lts-core/src/main/java/com/lts/job/remoting/common/RemotingUtil.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/common/RemotingUtil.java rename to lts-core/src/main/java/com/lts/job/remoting/common/RemotingUtil.java diff --git a/job-core/src/main/java/com/lts/job/remoting/common/SemaphoreReleaseOnlyOnce.java b/lts-core/src/main/java/com/lts/job/remoting/common/SemaphoreReleaseOnlyOnce.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/common/SemaphoreReleaseOnlyOnce.java rename to lts-core/src/main/java/com/lts/job/remoting/common/SemaphoreReleaseOnlyOnce.java diff --git a/job-core/src/main/java/com/lts/job/remoting/common/ServiceThread.java b/lts-core/src/main/java/com/lts/job/remoting/common/ServiceThread.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/common/ServiceThread.java rename to lts-core/src/main/java/com/lts/job/remoting/common/ServiceThread.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandFieldCheckException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandFieldCheckException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandFieldCheckException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingCommandFieldCheckException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingConnectException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingConnectException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingConnectException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingConnectException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingSendRequestException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingSendRequestException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingSendRequestException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingSendRequestException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingTimeoutException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingTimeoutException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingTimeoutException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingTimeoutException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/exception/RemotingTooMuchRequestException.java b/lts-core/src/main/java/com/lts/job/remoting/exception/RemotingTooMuchRequestException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/exception/RemotingTooMuchRequestException.java rename to lts-core/src/main/java/com/lts/job/remoting/exception/RemotingTooMuchRequestException.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyClientConfig.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyClientConfig.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyClientConfig.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyClientConfig.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyDecoder.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyDecoder.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyDecoder.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyDecoder.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyEncoder.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyEncoder.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyEncoder.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyEncoder.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyEvent.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyEvent.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyEvent.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyEvent.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyEventType.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyEventType.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyEventType.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyEventType.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingAbstract.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingAbstract.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingAbstract.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingAbstract.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingClient.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingClient.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingClient.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingServer.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingServer.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingServer.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyRemotingServer.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyRequestProcessor.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyRequestProcessor.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyRequestProcessor.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyRequestProcessor.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/NettyServerConfig.java b/lts-core/src/main/java/com/lts/job/remoting/netty/NettyServerConfig.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/NettyServerConfig.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/NettyServerConfig.java diff --git a/job-core/src/main/java/com/lts/job/remoting/netty/ResponseFuture.java b/lts-core/src/main/java/com/lts/job/remoting/netty/ResponseFuture.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/netty/ResponseFuture.java rename to lts-core/src/main/java/com/lts/job/remoting/netty/ResponseFuture.java diff --git a/job-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommand.java b/lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommand.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommand.java rename to lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommand.java diff --git a/job-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommandType.java b/lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommandType.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommandType.java rename to lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingCommandType.java diff --git a/job-core/src/main/java/com/lts/job/remoting/protocol/RemotingProtos.java b/lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingProtos.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/protocol/RemotingProtos.java rename to lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingProtos.java diff --git a/job-core/src/main/java/com/lts/job/remoting/protocol/RemotingSerializable.java b/lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingSerializable.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/protocol/RemotingSerializable.java rename to lts-core/src/main/java/com/lts/job/remoting/protocol/RemotingSerializable.java diff --git a/job-core/src/main/java/com/lts/job/remoting/protocol/protocol.txt b/lts-core/src/main/java/com/lts/job/remoting/protocol/protocol.txt similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/protocol/protocol.txt rename to lts-core/src/main/java/com/lts/job/remoting/protocol/protocol.txt diff --git a/job-core/src/main/java/com/lts/job/remoting/util/ReflectionUtils.java b/lts-core/src/main/java/com/lts/job/remoting/util/ReflectionUtils.java similarity index 100% rename from job-core/src/main/java/com/lts/job/remoting/util/ReflectionUtils.java rename to lts-core/src/main/java/com/lts/job/remoting/util/ReflectionUtils.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/DataSourceProvider.java b/lts-core/src/main/java/com/lts/job/store/jdbc/DataSourceProvider.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/DataSourceProvider.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/DataSourceProvider.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/JdbcRepository.java b/lts-core/src/main/java/com/lts/job/store/jdbc/JdbcRepository.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/JdbcRepository.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/JdbcRepository.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/SqlExecutor.java b/lts-core/src/main/java/com/lts/job/store/jdbc/SqlExecutor.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/SqlExecutor.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/SqlExecutor.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/SqlExecutorVoid.java b/lts-core/src/main/java/com/lts/job/store/jdbc/SqlExecutorVoid.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/SqlExecutorVoid.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/SqlExecutorVoid.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/SqlTemplate.java b/lts-core/src/main/java/com/lts/job/store/jdbc/SqlTemplate.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/SqlTemplate.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/SqlTemplate.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/StateException.java b/lts-core/src/main/java/com/lts/job/store/jdbc/StateException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/StateException.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/StateException.java diff --git a/job-core/src/main/java/com/lts/job/store/jdbc/TxConnectionFactory.java b/lts-core/src/main/java/com/lts/job/store/jdbc/TxConnectionFactory.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/jdbc/TxConnectionFactory.java rename to lts-core/src/main/java/com/lts/job/store/jdbc/TxConnectionFactory.java diff --git a/job-core/src/main/java/com/lts/job/store/mongo/DataStoreProvider.java b/lts-core/src/main/java/com/lts/job/store/mongo/DataStoreProvider.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/mongo/DataStoreProvider.java rename to lts-core/src/main/java/com/lts/job/store/mongo/DataStoreProvider.java diff --git a/job-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java b/lts-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java similarity index 95% rename from job-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java rename to lts-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java index 67f120474..a2845910a 100644 --- a/job-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java +++ b/lts-core/src/main/java/com/lts/job/store/mongo/MongoFactoryBean.java @@ -3,10 +3,7 @@ import com.lts.job.core.logger.Logger; import com.lts.job.core.logger.LoggerFactory; import com.lts.job.core.util.StringUtils; -import com.mongodb.MongoClient; -import com.mongodb.MongoClientOptions; -import com.mongodb.MongoCredential; -import com.mongodb.ServerAddress; +import com.mongodb.*; import java.util.ArrayList; import java.util.List; diff --git a/job-core/src/main/java/com/lts/job/store/mongo/MongoRepository.java b/lts-core/src/main/java/com/lts/job/store/mongo/MongoRepository.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/mongo/MongoRepository.java rename to lts-core/src/main/java/com/lts/job/store/mongo/MongoRepository.java diff --git a/job-core/src/main/java/com/lts/job/store/mongo/MongoTemplate.java b/lts-core/src/main/java/com/lts/job/store/mongo/MongoTemplate.java similarity index 100% rename from job-core/src/main/java/com/lts/job/store/mongo/MongoTemplate.java rename to lts-core/src/main/java/com/lts/job/store/mongo/MongoTemplate.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/ChildListener.java b/lts-core/src/main/java/com/lts/job/zookeeper/ChildListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/ChildListener.java rename to lts-core/src/main/java/com/lts/job/zookeeper/ChildListener.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/StateListener.java b/lts-core/src/main/java/com/lts/job/zookeeper/StateListener.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/StateListener.java rename to lts-core/src/main/java/com/lts/job/zookeeper/StateListener.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/ZookeeperClient.java b/lts-core/src/main/java/com/lts/job/zookeeper/ZookeeperClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/ZookeeperClient.java rename to lts-core/src/main/java/com/lts/job/zookeeper/ZookeeperClient.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/ZookeeperTransporter.java b/lts-core/src/main/java/com/lts/job/zookeeper/ZookeeperTransporter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/ZookeeperTransporter.java rename to lts-core/src/main/java/com/lts/job/zookeeper/ZookeeperTransporter.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperClient.java b/lts-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperClient.java rename to lts-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperClient.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperTransporter.java b/lts-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperTransporter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperTransporter.java rename to lts-core/src/main/java/com/lts/job/zookeeper/curator/CuratorZookeeperTransporter.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/serializer/SerializableSerializer.java b/lts-core/src/main/java/com/lts/job/zookeeper/serializer/SerializableSerializer.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/serializer/SerializableSerializer.java rename to lts-core/src/main/java/com/lts/job/zookeeper/serializer/SerializableSerializer.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/serializer/ZkMarshallingException.java b/lts-core/src/main/java/com/lts/job/zookeeper/serializer/ZkMarshallingException.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/serializer/ZkMarshallingException.java rename to lts-core/src/main/java/com/lts/job/zookeeper/serializer/ZkMarshallingException.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/serializer/ZkSerializer.java b/lts-core/src/main/java/com/lts/job/zookeeper/serializer/ZkSerializer.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/serializer/ZkSerializer.java rename to lts-core/src/main/java/com/lts/job/zookeeper/serializer/ZkSerializer.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/support/AbstractZookeeperClient.java b/lts-core/src/main/java/com/lts/job/zookeeper/support/AbstractZookeeperClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/support/AbstractZookeeperClient.java rename to lts-core/src/main/java/com/lts/job/zookeeper/support/AbstractZookeeperClient.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperClient.java b/lts-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperClient.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperClient.java rename to lts-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperClient.java diff --git a/job-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperTransporter.java b/lts-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperTransporter.java similarity index 100% rename from job-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperTransporter.java rename to lts-core/src/main/java/com/lts/job/zookeeper/zkclient/ZkClientZookeeperTransporter.java diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.compiler.Compiler b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.compiler.Compiler similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.compiler.Compiler rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.compiler.Compiler diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.extension.ExtensionFactory b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.extension.ExtensionFactory similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.extension.ExtensionFactory rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.extension.ExtensionFactory diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.failstore.FailStoreFactory b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.failstore.FailStoreFactory similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.failstore.FailStoreFactory rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.failstore.FailStoreFactory diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.loadbalance.LoadBalance b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.loadbalance.LoadBalance similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.loadbalance.LoadBalance rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.loadbalance.LoadBalance diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.logger.LoggerAdapter b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.logger.LoggerAdapter similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.logger.LoggerAdapter rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.core.logger.LoggerAdapter diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.ec.EventCenterFactory b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.ec.EventCenterFactory similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.ec.EventCenterFactory rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.ec.EventCenterFactory diff --git a/job-core/src/main/resources/META-INF/lts/internal/com.lts.job.zookeeper.ZookeeperTransporter b/lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.zookeeper.ZookeeperTransporter similarity index 100% rename from job-core/src/main/resources/META-INF/lts/internal/com.lts.job.zookeeper.ZookeeperTransporter rename to lts-core/src/main/resources/META-INF/lts/internal/com.lts.job.zookeeper.ZookeeperTransporter diff --git a/job-core/src/test/java/com/lts/job/core/ConstantsTest.java b/lts-core/src/test/java/com/lts/job/core/ConstantsTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/ConstantsTest.java rename to lts-core/src/test/java/com/lts/job/core/ConstantsTest.java diff --git a/job-core/src/test/java/com/lts/job/core/CronExpressionTest.java b/lts-core/src/test/java/com/lts/job/core/CronExpressionTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/CronExpressionTest.java rename to lts-core/src/test/java/com/lts/job/core/CronExpressionTest.java diff --git a/job-core/src/test/java/com/lts/job/core/NetUtilsTest.java b/lts-core/src/test/java/com/lts/job/core/NetUtilsTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/NetUtilsTest.java rename to lts-core/src/test/java/com/lts/job/core/NetUtilsTest.java diff --git a/job-core/src/test/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreTest.java b/lts-core/src/test/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreTest.java rename to lts-core/src/test/java/com/lts/job/core/failstore/berkeleydb/BerkeleydbFailStoreTest.java diff --git a/job-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java b/lts-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java similarity index 93% rename from job-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java rename to lts-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java index 270265351..79ccd49be 100644 --- a/job-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java +++ b/lts-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbFailStoreTest.java @@ -7,6 +7,7 @@ import com.lts.job.core.domain.KVPair; import com.lts.job.core.failstore.FailStore; import com.lts.job.core.failstore.FailStoreException; +import com.lts.job.core.failstore.berkeleydb.BerkeleydbFailStore; import com.lts.job.core.util.CollectionUtils; import com.lts.job.core.util.JSONUtils; import org.junit.Before; @@ -14,6 +15,8 @@ import java.util.List; +import static org.junit.Assert.*; + /** * Robert HG (254963746@qq.com) on 5/27/15. */ diff --git a/job-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbTest.java b/lts-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbTest.java rename to lts-core/src/test/java/com/lts/job/core/failstore/rocksdb/RocksdbTest.java diff --git a/job-core/src/test/java/com/lts/job/core/file/FileLockTest.java b/lts-core/src/test/java/com/lts/job/core/file/FileLockTest.java similarity index 96% rename from job-core/src/test/java/com/lts/job/core/file/FileLockTest.java rename to lts-core/src/test/java/com/lts/job/core/file/FileLockTest.java index 3a3b33378..81744df52 100644 --- a/job-core/src/test/java/com/lts/job/core/file/FileLockTest.java +++ b/lts-core/src/test/java/com/lts/job/core/file/FileLockTest.java @@ -2,6 +2,8 @@ import java.io.IOException; +import static org.junit.Assert.*; + /** * Robert HG (254963746@qq.com) on 5/27/15. */ diff --git a/job-core/src/test/java/com/lts/job/core/spi/MainTest.java b/lts-core/src/test/java/com/lts/job/core/spi/MainTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/spi/MainTest.java rename to lts-core/src/test/java/com/lts/job/core/spi/MainTest.java diff --git a/job-core/src/test/java/com/lts/job/core/spi/TestService.java b/lts-core/src/test/java/com/lts/job/core/spi/TestService.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/spi/TestService.java rename to lts-core/src/test/java/com/lts/job/core/spi/TestService.java diff --git a/job-core/src/test/java/com/lts/job/core/spi/TestServiceImpl.java b/lts-core/src/test/java/com/lts/job/core/spi/TestServiceImpl.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/spi/TestServiceImpl.java rename to lts-core/src/test/java/com/lts/job/core/spi/TestServiceImpl.java diff --git a/job-core/src/test/java/com/lts/job/core/spi/TestServiceImpl2.java b/lts-core/src/test/java/com/lts/job/core/spi/TestServiceImpl2.java similarity index 100% rename from job-core/src/test/java/com/lts/job/core/spi/TestServiceImpl2.java rename to lts-core/src/test/java/com/lts/job/core/spi/TestServiceImpl2.java diff --git a/job-core/src/test/java/com/lts/job/remoting/JsonTest.java b/lts-core/src/test/java/com/lts/job/remoting/JsonTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/remoting/JsonTest.java rename to lts-core/src/test/java/com/lts/job/remoting/JsonTest.java diff --git a/job-core/src/test/java/com/lts/job/remoting/NettyRPCTest.java b/lts-core/src/test/java/com/lts/job/remoting/NettyRPCTest.java similarity index 100% rename from job-core/src/test/java/com/lts/job/remoting/NettyRPCTest.java rename to lts-core/src/test/java/com/lts/job/remoting/NettyRPCTest.java diff --git a/job-core/src/test/resources/META-INF/lts/com.lts.job.core.spi.TestService b/lts-core/src/test/resources/META-INF/lts/com.lts.job.core.spi.TestService similarity index 100% rename from job-core/src/test/resources/META-INF/lts/com.lts.job.core.spi.TestService rename to lts-core/src/test/resources/META-INF/lts/com.lts.job.core.spi.TestService diff --git a/job-example/pom.xml b/lts-example/pom.xml similarity index 79% rename from job-example/pom.xml rename to lts-example/pom.xml index 334a19abb..03b2ab1e7 100644 --- a/job-example/pom.xml +++ b/lts-example/pom.xml @@ -3,53 +3,53 @@ 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"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-example + lts-example com.lts - job-tracker + lts-job-tracker ${project.version} com.lts - job-task-tracker + lts-task-tracker ${project.version} com.lts - job-client + lts-job-client ${project.version} com.lts - job-logger-mongo + lts-logger-mongo ${project.version} com.lts - job-logger-console + lts-logger-console ${project.version} com.lts - job-logger-mysql + lts-logger-mysql ${project.version} com.lts - job-queue-mongo + lts-queue-mongo ${project.version} com.lts - job-queue-mysql + lts-queue-mysql ${project.version} @@ -80,10 +80,6 @@ org.fusesource.leveldbjni leveldbjni-all - - com.alibaba - druid - junit junit diff --git a/job-example/src/main/java/com/lts/job/example/api/JobClientTest.java b/lts-example/src/main/java/com/lts/job/example/api/JobClientTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/api/JobClientTest.java rename to lts-example/src/main/java/com/lts/job/example/api/JobClientTest.java diff --git a/job-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java b/lts-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java similarity index 98% rename from job-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java rename to lts-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java index cf8b8aa36..1b45b57d2 100644 --- a/job-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java +++ b/lts-example/src/main/java/com/lts/job/example/api/JobTrackerTest.java @@ -12,9 +12,9 @@ public class JobTrackerTest { public static void main(String[] args) { // 1. 使用mongo做任务队列 - testMongoQueue(); +// testMongoQueue(); // 2. 使用mysql做任务队列 -// testMysqlQueue(); + testMysqlQueue(); } /** diff --git a/job-example/src/main/java/com/lts/job/example/api/TaskTrackerTest.java b/lts-example/src/main/java/com/lts/job/example/api/TaskTrackerTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/api/TaskTrackerTest.java rename to lts-example/src/main/java/com/lts/job/example/api/TaskTrackerTest.java diff --git a/job-example/src/main/java/com/lts/job/example/spring/JobClientTest.java b/lts-example/src/main/java/com/lts/job/example/spring/JobClientTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/spring/JobClientTest.java rename to lts-example/src/main/java/com/lts/job/example/spring/JobClientTest.java diff --git a/job-example/src/main/java/com/lts/job/example/spring/JobTrackerTest.java b/lts-example/src/main/java/com/lts/job/example/spring/JobTrackerTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/spring/JobTrackerTest.java rename to lts-example/src/main/java/com/lts/job/example/spring/JobTrackerTest.java diff --git a/job-example/src/main/java/com/lts/job/example/spring/TaskTrackerTest.java b/lts-example/src/main/java/com/lts/job/example/spring/TaskTrackerTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/spring/TaskTrackerTest.java rename to lts-example/src/main/java/com/lts/job/example/spring/TaskTrackerTest.java diff --git a/job-example/src/main/java/com/lts/job/example/support/BaseJobClientTest.java b/lts-example/src/main/java/com/lts/job/example/support/BaseJobClientTest.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/support/BaseJobClientTest.java rename to lts-example/src/main/java/com/lts/job/example/support/BaseJobClientTest.java diff --git a/job-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java b/lts-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java rename to lts-example/src/main/java/com/lts/job/example/support/JobFinishedHandlerImpl.java diff --git a/job-example/src/main/java/com/lts/job/example/support/MasterChangeListenerImpl.java b/lts-example/src/main/java/com/lts/job/example/support/MasterChangeListenerImpl.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/support/MasterChangeListenerImpl.java rename to lts-example/src/main/java/com/lts/job/example/support/MasterChangeListenerImpl.java diff --git a/job-example/src/main/java/com/lts/job/example/support/TestJobRunner.java b/lts-example/src/main/java/com/lts/job/example/support/TestJobRunner.java similarity index 100% rename from job-example/src/main/java/com/lts/job/example/support/TestJobRunner.java rename to lts-example/src/main/java/com/lts/job/example/support/TestJobRunner.java diff --git a/job-example/src/main/resources/log4j.properties b/lts-example/src/main/resources/log4j.properties similarity index 100% rename from job-example/src/main/resources/log4j.properties rename to lts-example/src/main/resources/log4j.properties diff --git a/job-example/src/main/resources/lts-spring-job-client.xml b/lts-example/src/main/resources/lts-spring-job-client.xml similarity index 100% rename from job-example/src/main/resources/lts-spring-job-client.xml rename to lts-example/src/main/resources/lts-spring-job-client.xml diff --git a/job-example/src/main/resources/lts-spring-job-tacker.xml b/lts-example/src/main/resources/lts-spring-job-tacker.xml similarity index 100% rename from job-example/src/main/resources/lts-spring-job-tacker.xml rename to lts-example/src/main/resources/lts-spring-job-tacker.xml diff --git a/job-example/src/main/resources/lts-spring-job-tasktracker.xml b/lts-example/src/main/resources/lts-spring-job-tasktracker.xml similarity index 100% rename from job-example/src/main/resources/lts-spring-job-tasktracker.xml rename to lts-example/src/main/resources/lts-spring-job-tasktracker.xml diff --git a/job-extensions/job-ext-spring/pom.xml b/lts-extensions/lts-ext-spring/pom.xml similarity index 88% rename from job-extensions/job-ext-spring/pom.xml rename to lts-extensions/lts-ext-spring/pom.xml index 217d81aff..4d6001bae 100644 --- a/job-extensions/job-ext-spring/pom.xml +++ b/lts-extensions/lts-ext-spring/pom.xml @@ -5,7 +5,7 @@ job-extensions com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 @@ -28,19 +28,19 @@ com.lts - job-client + lts-job-client ${project.version} provided com.lts - job-task-tracker + lts-task-tracker ${project.version} provided com.lts - job-tracker + lts-job-tracker ${project.version} provided diff --git a/job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/JobClientFactoryBean.java b/lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/JobClientFactoryBean.java similarity index 100% rename from job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/JobClientFactoryBean.java rename to lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/JobClientFactoryBean.java diff --git a/job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/JobTrackerFactoryBean.java b/lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/JobTrackerFactoryBean.java similarity index 100% rename from job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/JobTrackerFactoryBean.java rename to lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/JobTrackerFactoryBean.java diff --git a/job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/TaskTrackerFactoryBean.java b/lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/TaskTrackerFactoryBean.java similarity index 100% rename from job-extensions/job-ext-spring/src/main/java/com/lts/job/spring/TaskTrackerFactoryBean.java rename to lts-extensions/lts-ext-spring/src/main/java/com/lts/job/spring/TaskTrackerFactoryBean.java diff --git a/job-extensions/pom.xml b/lts-extensions/pom.xml similarity index 85% rename from job-extensions/pom.xml rename to lts-extensions/pom.xml index 1f829bd6d..5cbc4b480 100644 --- a/job-extensions/pom.xml +++ b/lts-extensions/pom.xml @@ -3,9 +3,9 @@ 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"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 pom diff --git a/job-client/pom.xml b/lts-job-client/pom.xml similarity index 75% rename from job-client/pom.xml rename to lts-job-client/pom.xml index 88382cf08..c86d7b60a 100644 --- a/job-client/pom.xml +++ b/lts-job-client/pom.xml @@ -3,18 +3,18 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-client + lts-job-client com.lts - job-core + lts-core ${project.version} diff --git a/job-client/src/main/java/com/lts/job/client/JobClient.java b/lts-job-client/src/main/java/com/lts/job/client/JobClient.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/JobClient.java rename to lts-job-client/src/main/java/com/lts/job/client/JobClient.java diff --git a/job-client/src/main/java/com/lts/job/client/RetryJobClient.java b/lts-job-client/src/main/java/com/lts/job/client/RetryJobClient.java similarity index 98% rename from job-client/src/main/java/com/lts/job/client/RetryJobClient.java rename to lts-job-client/src/main/java/com/lts/job/client/RetryJobClient.java index 43e3e0a77..347e12143 100644 --- a/job-client/src/main/java/com/lts/job/client/RetryJobClient.java +++ b/lts-job-client/src/main/java/com/lts/job/client/RetryJobClient.java @@ -8,6 +8,7 @@ import com.lts.job.core.domain.Job; import com.lts.job.core.support.RetryScheduler; import com.lts.job.core.util.JSONUtils; +import sun.security.util.Resources_es; import java.util.Arrays; import java.util.List; diff --git a/job-client/src/main/java/com/lts/job/client/domain/JobClientApplication.java b/lts-job-client/src/main/java/com/lts/job/client/domain/JobClientApplication.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/domain/JobClientApplication.java rename to lts-job-client/src/main/java/com/lts/job/client/domain/JobClientApplication.java diff --git a/job-client/src/main/java/com/lts/job/client/domain/JobClientNode.java b/lts-job-client/src/main/java/com/lts/job/client/domain/JobClientNode.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/domain/JobClientNode.java rename to lts-job-client/src/main/java/com/lts/job/client/domain/JobClientNode.java diff --git a/job-client/src/main/java/com/lts/job/client/domain/Response.java b/lts-job-client/src/main/java/com/lts/job/client/domain/Response.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/domain/Response.java rename to lts-job-client/src/main/java/com/lts/job/client/domain/Response.java diff --git a/job-client/src/main/java/com/lts/job/client/domain/ResponseCode.java b/lts-job-client/src/main/java/com/lts/job/client/domain/ResponseCode.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/domain/ResponseCode.java rename to lts-job-client/src/main/java/com/lts/job/client/domain/ResponseCode.java diff --git a/job-client/src/main/java/com/lts/job/client/processor/AbstractProcessor.java b/lts-job-client/src/main/java/com/lts/job/client/processor/AbstractProcessor.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/processor/AbstractProcessor.java rename to lts-job-client/src/main/java/com/lts/job/client/processor/AbstractProcessor.java diff --git a/job-client/src/main/java/com/lts/job/client/processor/JobFinishedProcessor.java b/lts-job-client/src/main/java/com/lts/job/client/processor/JobFinishedProcessor.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/processor/JobFinishedProcessor.java rename to lts-job-client/src/main/java/com/lts/job/client/processor/JobFinishedProcessor.java diff --git a/job-client/src/main/java/com/lts/job/client/processor/RemotingDispatcher.java b/lts-job-client/src/main/java/com/lts/job/client/processor/RemotingDispatcher.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/processor/RemotingDispatcher.java rename to lts-job-client/src/main/java/com/lts/job/client/processor/RemotingDispatcher.java diff --git a/job-client/src/main/java/com/lts/job/client/support/JobFinishedHandler.java b/lts-job-client/src/main/java/com/lts/job/client/support/JobFinishedHandler.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/support/JobFinishedHandler.java rename to lts-job-client/src/main/java/com/lts/job/client/support/JobFinishedHandler.java diff --git a/job-client/src/main/java/com/lts/job/client/support/JobSubmitExecutor.java b/lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitExecutor.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/support/JobSubmitExecutor.java rename to lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitExecutor.java diff --git a/job-client/src/main/java/com/lts/job/client/support/JobSubmitProtectException.java b/lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitProtectException.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/support/JobSubmitProtectException.java rename to lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitProtectException.java diff --git a/job-client/src/main/java/com/lts/job/client/support/JobSubmitProtector.java b/lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitProtector.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/support/JobSubmitProtector.java rename to lts-job-client/src/main/java/com/lts/job/client/support/JobSubmitProtector.java diff --git a/job-client/src/main/java/com/lts/job/client/support/SubmitCallback.java b/lts-job-client/src/main/java/com/lts/job/client/support/SubmitCallback.java similarity index 100% rename from job-client/src/main/java/com/lts/job/client/support/SubmitCallback.java rename to lts-job-client/src/main/java/com/lts/job/client/support/SubmitCallback.java diff --git a/job-tracker/pom.xml b/lts-job-tracker/pom.xml similarity index 74% rename from job-tracker/pom.xml rename to lts-job-tracker/pom.xml index 9872c23ef..bb1e33550 100644 --- a/job-tracker/pom.xml +++ b/lts-job-tracker/pom.xml @@ -3,28 +3,28 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-tracker + lts-job-tracker com.lts - job-core + lts-core ${project.version} com.lts - job-queue-api + lts-queue-api ${project.version} com.lts - job-logger-api + lts-logger-api ${project.version} diff --git a/job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/JobTracker.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelManager.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelManager.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelManager.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelManager.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelWrapper.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelWrapper.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelWrapper.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/channel/ChannelWrapper.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/domain/JobClientNode.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobClientNode.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/domain/JobClientNode.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobClientNode.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java index e57324fa6..a22835d86 100644 --- a/job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java +++ b/lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerApplication.java @@ -9,10 +9,10 @@ import com.lts.job.queue.JobFeedbackQueue; import com.lts.job.tracker.channel.ChannelManager; import com.lts.job.tracker.id.IdGenerator; -import com.lts.job.tracker.support.OldDataHandler; -import com.lts.job.tracker.support.checker.ExecutingDeadJobChecker; import com.lts.job.tracker.support.cluster.JobClientManager; +import com.lts.job.tracker.support.OldDataHandler; import com.lts.job.tracker.support.cluster.TaskTrackerManager; +import com.lts.job.tracker.support.checker.ExecutingDeadJobChecker; /** * JobTracker Application diff --git a/job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerNode.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerNode.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerNode.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/domain/JobTrackerNode.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/domain/TaskTrackerNode.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/domain/TaskTrackerNode.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/domain/TaskTrackerNode.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/domain/TaskTrackerNode.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/id/IdGenerator.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/id/IdGenerator.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/id/IdGenerator.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/id/IdGenerator.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/id/Md5Generator.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/id/Md5Generator.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/id/Md5Generator.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/id/Md5Generator.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/id/UUIDGenerator.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/id/UUIDGenerator.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/id/UUIDGenerator.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/id/UUIDGenerator.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/AbstractProcessor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/AbstractProcessor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/AbstractProcessor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/AbstractProcessor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/JobBizLogProcessor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobBizLogProcessor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/JobBizLogProcessor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobBizLogProcessor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobFinishedProcessor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/JobPullProcessor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobPullProcessor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/JobPullProcessor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobPullProcessor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/JobSubmitProcessor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobSubmitProcessor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/JobSubmitProcessor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/JobSubmitProcessor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/processor/RemotingDispatcher.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifier.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifyHandler.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifyHandler.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifyHandler.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/ClientNotifyHandler.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/CronExpressionUtils.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/CronExpressionUtils.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/CronExpressionUtils.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/CronExpressionUtils.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobDistributor.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobDomainConverter.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/JobReceiver.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/OldDataHandler.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutableDeadJobChecker.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutableDeadJobChecker.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutableDeadJobChecker.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutableDeadJobChecker.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutingDeadJobChecker.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutingDeadJobChecker.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutingDeadJobChecker.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/ExecutingDeadJobChecker.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/checker/FeedbackJobSendChecker.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/cluster/JobClientManager.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/cluster/JobClientManager.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/cluster/JobClientManager.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/cluster/JobClientManager.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/cluster/TaskTrackerManager.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/cluster/TaskTrackerManager.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/cluster/TaskTrackerManager.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/cluster/TaskTrackerManager.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobNodeChangeListener.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobNodeChangeListener.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobNodeChangeListener.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobNodeChangeListener.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobTrackerMasterChangeListener.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobTrackerMasterChangeListener.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobTrackerMasterChangeListener.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/listener/JobTrackerMasterChangeListener.java diff --git a/job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java b/lts-job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java similarity index 100% rename from job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java rename to lts-job-tracker/src/main/java/com/lts/job/tracker/support/policy/OldDataDeletePolicy.java diff --git a/job-tracker/src/main/resources/META-INF/lts/internal/com.lts.job.tracker.id.IdGenerator b/lts-job-tracker/src/main/resources/META-INF/lts/internal/com.lts.job.tracker.id.IdGenerator similarity index 100% rename from job-tracker/src/main/resources/META-INF/lts/internal/com.lts.job.tracker.id.IdGenerator rename to lts-job-tracker/src/main/resources/META-INF/lts/internal/com.lts.job.tracker.id.IdGenerator diff --git a/job-tracker/src/test/java/AutomicReferenceTest.java b/lts-job-tracker/src/test/java/AutomicReferenceTest.java similarity index 100% rename from job-tracker/src/test/java/AutomicReferenceTest.java rename to lts-job-tracker/src/test/java/AutomicReferenceTest.java diff --git a/job-logger/job-logger-api/pom.xml b/lts-logger/lts-logger-api/pom.xml similarity index 75% rename from job-logger/job-logger-api/pom.xml rename to lts-logger/lts-logger-api/pom.xml index 096380036..72c9cc5bd 100644 --- a/job-logger/job-logger-api/pom.xml +++ b/lts-logger/lts-logger-api/pom.xml @@ -3,18 +3,18 @@ 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"> - job-logger + lts-logger com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-logger-api + lts-logger-api com.lts - job-core + lts-core ${project.parent.version} diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogException.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogException.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogException.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogException.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogUtils.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogUtils.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogUtils.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogUtils.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogger.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogger.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLogger.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLogger.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLoggerFactory.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLoggerFactory.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/JobLoggerFactory.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/JobLoggerFactory.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/BizLogPo.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/BizLogPo.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/BizLogPo.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/BizLogPo.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/JobLogPo.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/JobLogPo.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/JobLogPo.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/JobLogPo.java diff --git a/job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/LogType.java b/lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/LogType.java similarity index 100% rename from job-logger/job-logger-api/src/main/java/com/lts/job/biz/logger/domain/LogType.java rename to lts-logger/lts-logger-api/src/main/java/com/lts/job/biz/logger/domain/LogType.java diff --git a/job-logger/job-logger-console/pom.xml b/lts-logger/lts-logger-console/pom.xml similarity index 74% rename from job-logger/job-logger-console/pom.xml rename to lts-logger/lts-logger-console/pom.xml index 33ee1c615..437131e11 100644 --- a/job-logger/job-logger-console/pom.xml +++ b/lts-logger/lts-logger-console/pom.xml @@ -3,18 +3,18 @@ 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"> - job-logger + lts-logger com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-logger-console + lts-logger-console com.lts - job-logger-api + lts-logger-api ${project.version} diff --git a/job-logger/job-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleJobLogger.java b/lts-logger/lts-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleJobLogger.java similarity index 100% rename from job-logger/job-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleJobLogger.java rename to lts-logger/lts-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleJobLogger.java diff --git a/job-logger/job-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleLoggerFactory.java b/lts-logger/lts-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleLoggerFactory.java similarity index 100% rename from job-logger/job-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleLoggerFactory.java rename to lts-logger/lts-logger-console/src/main/java/com/lts/job/biz/logger/console/ConsoleLoggerFactory.java diff --git a/job-logger/job-logger-console/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory b/lts-logger/lts-logger-console/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory similarity index 100% rename from job-logger/job-logger-console/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory rename to lts-logger/lts-logger-console/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory diff --git a/job-logger/job-logger-mongo/pom.xml b/lts-logger/lts-logger-mongo/pom.xml similarity index 81% rename from job-logger/job-logger-mongo/pom.xml rename to lts-logger/lts-logger-mongo/pom.xml index 59a2778c6..bfc4fd690 100644 --- a/job-logger/job-logger-mongo/pom.xml +++ b/lts-logger/lts-logger-mongo/pom.xml @@ -3,18 +3,18 @@ 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"> - job-logger + lts-logger com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-logger-mongo + lts-logger-mongo com.lts - job-logger-api + lts-logger-api ${project.version} diff --git a/job-logger/job-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLogger.java b/lts-logger/lts-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLogger.java similarity index 100% rename from job-logger/job-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLogger.java rename to lts-logger/lts-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLogger.java diff --git a/job-logger/job-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLoggerFactory.java b/lts-logger/lts-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLoggerFactory.java similarity index 100% rename from job-logger/job-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLoggerFactory.java rename to lts-logger/lts-logger-mongo/src/main/java/com/lts/job/biz/logger/mongo/MongoJobLoggerFactory.java diff --git a/job-logger/job-logger-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory b/lts-logger/lts-logger-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory similarity index 100% rename from job-logger/job-logger-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory rename to lts-logger/lts-logger-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory diff --git a/job-queue/job-queue-mysql/pom.xml b/lts-logger/lts-logger-mysql/pom.xml similarity index 72% rename from job-queue/job-queue-mysql/pom.xml rename to lts-logger/lts-logger-mysql/pom.xml index 5720e4448..343ed5514 100644 --- a/job-queue/job-queue-mysql/pom.xml +++ b/lts-logger/lts-logger-mysql/pom.xml @@ -3,18 +3,18 @@ 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"> - job-queue + lts-logger com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-queue-mysql + lts-logger-mysql com.lts - job-queue-api + lts-logger-api ${project.version} @@ -25,5 +25,10 @@ mysql mysql-connector-java + + com.alibaba + druid + + \ No newline at end of file diff --git a/job-logger/job-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLogger.java b/lts-logger/lts-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLogger.java similarity index 100% rename from job-logger/job-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLogger.java rename to lts-logger/lts-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLogger.java diff --git a/job-logger/job-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLoggerFactory.java b/lts-logger/lts-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLoggerFactory.java similarity index 100% rename from job-logger/job-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLoggerFactory.java rename to lts-logger/lts-logger-mysql/src/main/java/com/lts/job/biz/logger/mysql/MysqlJobLoggerFactory.java diff --git a/job-logger/job-logger-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory b/lts-logger/lts-logger-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory similarity index 100% rename from job-logger/job-logger-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory rename to lts-logger/lts-logger-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.biz.logger.JobLoggerFactory diff --git a/job-logger/job-logger-mysql/src/main/resources/sql/lts_job_log_po.sql b/lts-logger/lts-logger-mysql/src/main/resources/sql/lts_job_log_po.sql similarity index 100% rename from job-logger/job-logger-mysql/src/main/resources/sql/lts_job_log_po.sql rename to lts-logger/lts-logger-mysql/src/main/resources/sql/lts_job_log_po.sql diff --git a/job-logger/pom.xml b/lts-logger/pom.xml similarity index 59% rename from job-logger/pom.xml rename to lts-logger/pom.xml index 6869968d9..502219cc1 100644 --- a/job-logger/pom.xml +++ b/lts-logger/pom.xml @@ -3,19 +3,19 @@ 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"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-logger + lts-logger pom - job-logger-console - job-logger-mongo - job-logger-api - job-logger-mysql + lts-logger-console + lts-logger-mongo + lts-logger-api + lts-logger-mysql \ No newline at end of file diff --git a/job-queue/job-queue-api/pom.xml b/lts-queue/lts-queue-api/pom.xml similarity index 75% rename from job-queue/job-queue-api/pom.xml rename to lts-queue/lts-queue-api/pom.xml index d8f54f34e..0458704a5 100644 --- a/job-queue/job-queue-api/pom.xml +++ b/lts-queue/lts-queue-api/pom.xml @@ -3,18 +3,18 @@ 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"> - job-queue + lts-queue com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-queue-api + lts-queue-api com.lts - job-core + lts-core ${project.version} diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/CronJobQueue.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/CronJobQueue.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/CronJobQueue.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/CronJobQueue.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/CronJobQueueFactory.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/CronJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/CronJobQueueFactory.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/CronJobQueueFactory.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueue.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueue.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueue.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueue.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueueFactory.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueueFactory.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutableJobQueueFactory.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueue.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueue.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueue.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueue.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueueFactory.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueueFactory.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/ExecutingJobQueueFactory.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueue.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueue.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueue.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueue.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueueFactory.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueueFactory.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueueFactory.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/JobFeedbackQueueFactory.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/domain/JobFeedbackPo.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/domain/JobFeedbackPo.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/domain/JobFeedbackPo.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/domain/JobFeedbackPo.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/domain/JobPo.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/domain/JobPo.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/domain/JobPo.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/domain/JobPo.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/exception/DuplicateJobException.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/exception/DuplicateJobException.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/exception/DuplicateJobException.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/exception/DuplicateJobException.java diff --git a/job-queue/job-queue-api/src/main/java/com/lts/job/queue/exception/JobQueueException.java b/lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/exception/JobQueueException.java similarity index 100% rename from job-queue/job-queue-api/src/main/java/com/lts/job/queue/exception/JobQueueException.java rename to lts-queue/lts-queue-api/src/main/java/com/lts/job/queue/exception/JobQueueException.java diff --git a/job-queue/job-queue-mongo/pom.xml b/lts-queue/lts-queue-mongo/pom.xml similarity index 82% rename from job-queue/job-queue-mongo/pom.xml rename to lts-queue/lts-queue-mongo/pom.xml index da8f817bf..2373f30ac 100644 --- a/job-queue/job-queue-mongo/pom.xml +++ b/lts-queue/lts-queue-mongo/pom.xml @@ -3,18 +3,18 @@ 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"> - job-queue + lts-queue com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 jar - job-queue-mongo + lts-queue-mongo com.lts - job-queue-api + lts-queue-api ${project.version} diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java similarity index 93% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java index 5495fc628..e68477715 100644 --- a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java +++ b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueue.java @@ -8,10 +8,7 @@ import com.lts.job.queue.domain.JobPo; import com.lts.job.queue.exception.DuplicateJobException; import com.lts.job.store.mongo.MongoRepository; -import com.mongodb.DBCollection; -import com.mongodb.DBObject; -import com.mongodb.DuplicateKeyException; -import com.mongodb.WriteResult; +import com.mongodb.*; import org.mongodb.morphia.query.Query; import java.util.List; diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueueFactory.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueueFactory.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoCronJobQueueFactory.java diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueue.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueue.java similarity index 100% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueue.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueue.java diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueueFactory.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueueFactory.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutableJobQueueFactory.java diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java similarity index 94% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java index e96efbe43..bcd908f93 100644 --- a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java +++ b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueue.java @@ -8,10 +8,7 @@ import com.lts.job.queue.domain.JobPo; import com.lts.job.queue.exception.DuplicateJobException; import com.lts.job.store.mongo.MongoRepository; -import com.mongodb.DBCollection; -import com.mongodb.DBObject; -import com.mongodb.DuplicateKeyException; -import com.mongodb.WriteResult; +import com.mongodb.*; import org.mongodb.morphia.query.Query; import java.util.List; diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueueFactory.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueueFactory.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoExecutingJobQueueFactory.java diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java similarity index 95% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java index 3ab87c334..bcd9c3953 100644 --- a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java +++ b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueue.java @@ -9,10 +9,7 @@ import com.lts.job.queue.JobFeedbackQueue; import com.lts.job.queue.domain.JobFeedbackPo; import com.lts.job.store.mongo.MongoRepository; -import com.mongodb.DBCollection; -import com.mongodb.DBObject; -import com.mongodb.DuplicateKeyException; -import com.mongodb.WriteResult; +import com.mongodb.*; import org.mongodb.morphia.query.Query; import java.util.List; diff --git a/job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueueFactory.java b/lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueueFactory.java similarity index 100% rename from job-queue/job-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueueFactory.java rename to lts-queue/lts-queue-mongo/src/main/java/com/lts/job/queue/mongo/MongoJobFeedbackQueueFactory.java diff --git a/job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory b/lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory similarity index 100% rename from job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory rename to lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory diff --git a/job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory b/lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory similarity index 100% rename from job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory rename to lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory diff --git a/job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory b/lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory similarity index 100% rename from job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory rename to lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory diff --git a/job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory b/lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory similarity index 100% rename from job-queue/job-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory rename to lts-queue/lts-queue-mongo/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory diff --git a/job-logger/job-logger-mysql/pom.xml b/lts-queue/lts-queue-mysql/pom.xml similarity index 72% rename from job-logger/job-logger-mysql/pom.xml rename to lts-queue/lts-queue-mysql/pom.xml index 65e24326d..13de1adbc 100644 --- a/job-logger/job-logger-mysql/pom.xml +++ b/lts-queue/lts-queue-mysql/pom.xml @@ -3,18 +3,18 @@ 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"> - job-logger + lts-queue com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-logger-mysql + lts-queue-mysql com.lts - job-logger-api + lts-queue-api ${project.version} @@ -25,6 +25,9 @@ mysql mysql-connector-java + + com.alibaba + druid + - \ No newline at end of file diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/AbstractMysqlJobQueue.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/AbstractMysqlJobQueue.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/AbstractMysqlJobQueue.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/AbstractMysqlJobQueue.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueue.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueue.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueue.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueue.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueueFactory.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueueFactory.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlCronJobQueueFactory.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueue.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueue.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueue.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueue.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueueFactory.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueueFactory.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutableJobQueueFactory.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueue.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueue.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueue.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueue.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueueFactory.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueueFactory.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueueFactory.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlExecutingJobQueueFactory.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueue.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueue.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueue.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueue.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueueFactory.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueueFactory.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueueFactory.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/MysqlJobFeedbackQueueFactory.java diff --git a/job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/support/ResultSetHandlerHolder.java b/lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/support/ResultSetHandlerHolder.java similarity index 100% rename from job-queue/job-queue-mysql/src/main/java/com/lts/job/queue/mysql/support/ResultSetHandlerHolder.java rename to lts-queue/lts-queue-mysql/src/main/java/com/lts/job/queue/mysql/support/ResultSetHandlerHolder.java diff --git a/job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory b/lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory rename to lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.CronJobQueueFactory diff --git a/job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory b/lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory rename to lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutableJobQueueFactory diff --git a/job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory b/lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory rename to lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.ExecutingJobQueueFactory diff --git a/job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory b/lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory rename to lts-queue/lts-queue-mysql/src/main/resources/META-INF/lts/internal/com.lts.job.queue.JobFeedbackQueueFactory diff --git a/job-queue/job-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql b/lts-queue/lts-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql rename to lts-queue/lts-queue-mysql/src/main/resources/sql/lts_cron_job_queue.sql diff --git a/job-queue/job-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql b/lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql rename to lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executable_job_queue.sql diff --git a/job-queue/job-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql b/lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql rename to lts-queue/lts-queue-mysql/src/main/resources/sql/lts_executing_job_queue.sql diff --git a/job-queue/job-queue-mysql/src/main/resources/sql/lts_job_feedback_queue.sql b/lts-queue/lts-queue-mysql/src/main/resources/sql/lts_job_feedback_queue.sql similarity index 100% rename from job-queue/job-queue-mysql/src/main/resources/sql/lts_job_feedback_queue.sql rename to lts-queue/lts-queue-mysql/src/main/resources/sql/lts_job_feedback_queue.sql diff --git a/job-queue/pom.xml b/lts-queue/pom.xml similarity index 63% rename from job-queue/pom.xml rename to lts-queue/pom.xml index decf57430..a02eba80c 100644 --- a/job-queue/pom.xml +++ b/lts-queue/pom.xml @@ -3,19 +3,19 @@ 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"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-queue + lts-queue pom - job-queue-mongo - job-queue-mysql - job-queue-api + lts-queue-mongo + lts-queue-mysql + lts-queue-api \ No newline at end of file diff --git a/job-task-tracker/pom.xml b/lts-task-tracker/pom.xml similarity index 75% rename from job-task-tracker/pom.xml rename to lts-task-tracker/pom.xml index 39b55e775..86f159e23 100644 --- a/job-task-tracker/pom.xml +++ b/lts-task-tracker/pom.xml @@ -3,18 +3,18 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - job-parent + lts-parent com.lts - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT 4.0.0 - job-task-tracker + lts-task-tracker com.lts - job-core + lts-core ${project.version} diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/TaskTracker.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/Response.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/Response.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/Response.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/Response.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerApplication.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerNode.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerNode.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerNode.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/domain/TaskTrackerNode.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/JobRunException.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/JobRunException.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/JobRunException.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/JobRunException.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/NoAvailableJobRunnerException.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/NoAvailableJobRunnerException.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/NoAvailableJobRunnerException.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/expcetion/NoAvailableJobRunnerException.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLogger.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLogger.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLogger.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLogger.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerFactory.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerFactory.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerFactory.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerFactory.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java similarity index 97% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java index fabf8ab22..1e4a197f7 100644 --- a/job-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java +++ b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/logger/BizLoggerImpl.java @@ -6,6 +6,7 @@ import com.lts.job.core.protocol.command.BizLogSendRequest; import com.lts.job.core.remoting.RemotingClientDelegate; import com.lts.job.remoting.InvokeCallback; +import com.lts.job.remoting.exception.RemotingCommandFieldCheckException; import com.lts.job.remoting.netty.ResponseFuture; import com.lts.job.remoting.protocol.RemotingCommand; import com.lts.job.task.tracker.domain.TaskTrackerApplication; diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/AbstractProcessor.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/AbstractProcessor.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/AbstractProcessor.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/AbstractProcessor.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobAskProcessor.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobAskProcessor.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobAskProcessor.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobAskProcessor.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/JobPushProcessor.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/RemotingDispatcher.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/RemotingDispatcher.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/processor/RemotingDispatcher.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/processor/RemotingDispatcher.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultJobRunner.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultJobRunner.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultJobRunner.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultJobRunner.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultRunnerFactory.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultRunnerFactory.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultRunnerFactory.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/DefaultRunnerFactory.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunner.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunner.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunner.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunner.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/JobRunnerDelegate.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/LtsLoggerFactory.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/LtsLoggerFactory.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/LtsLoggerFactory.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/LtsLoggerFactory.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerCallback.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerCallback.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerCallback.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerCallback.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerFactory.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerFactory.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerFactory.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerFactory.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerPool.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerPool.java similarity index 100% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerPool.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/runner/RunnerPool.java diff --git a/job-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java similarity index 97% rename from job-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java rename to lts-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java index 3e23aa58f..a86640d94 100644 --- a/job-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java +++ b/lts-task-tracker/src/main/java/com/lts/job/task/tracker/support/JobPullMachine.java @@ -5,7 +5,9 @@ import com.lts.job.core.logger.LoggerFactory; import com.lts.job.core.protocol.JobProtos; import com.lts.job.core.protocol.command.JobPullRequest; +import com.lts.job.remoting.InvokeCallback; import com.lts.job.remoting.exception.RemotingCommandFieldCheckException; +import com.lts.job.remoting.netty.ResponseFuture; import com.lts.job.remoting.protocol.RemotingCommand; import com.lts.job.task.tracker.domain.TaskTrackerApplication; diff --git a/job-task-tracker/src/test/java/com/lts/job/task/tracker/ThreadPoolDynamicTest.java b/lts-task-tracker/src/test/java/com/lts/job/task/tracker/ThreadPoolDynamicTest.java similarity index 100% rename from job-task-tracker/src/test/java/com/lts/job/task/tracker/ThreadPoolDynamicTest.java rename to lts-task-tracker/src/test/java/com/lts/job/task/tracker/ThreadPoolDynamicTest.java diff --git a/pom.xml b/pom.xml index e7a31cd1d..11028fab5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,19 +5,18 @@ 4.0.0 com.lts - job-parent + lts-parent pom - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT - job-core - job-tracker - job-task-tracker - job-client - job-example - - - job-queue - job-logger + lts-core + lts-job-tracker + lts-task-tracker + lts-job-client + lts-queue + lts-logger + lts-example + @@ -99,16 +98,6 @@ - - - - - - - - - - org.mongodb mongo-java-driver