diff --git a/docs/en_US/EasyScheduler-FAQ.md b/docs/en_US/EasyScheduler-FAQ.md index b55b0e2413..65b3add815 100644 --- a/docs/en_US/EasyScheduler-FAQ.md +++ b/docs/en_US/EasyScheduler-FAQ.md @@ -50,7 +50,7 @@ A: We also support **the priority of processes and tasks**. Priority We have fiv ---- -## Q: Escheduler-grpc gives an error +## Q: dolphinscheduler-grpc gives an error A: Execute in the root directory: mvn -U clean package assembly:assembly -Dmaven.test.skip=true , then refresh the entire project @@ -70,11 +70,11 @@ A: Install **npm install node-sass --unsafe-perm** separately, then **npm instal ## Q: UI cannot log in normally. -A: 1, if it is node startup, check whether the .env API_BASE configuration under escheduler-ui is the Api Server service address. +A: 1, if it is node startup, check whether the .env API_BASE configuration under dolphinscheduler-ui is the Api Server service address. - 2, If it is nginx booted and installed via **install-escheduler-ui.sh**, check if the proxy_pass configuration in **/etc/nginx/conf.d/escheduler.conf** is the Api Server service. address + 2, If it is nginx booted and installed via **install-dolphinscheduler-ui.sh**, check if the proxy_pass configuration in **/etc/nginx/conf.d/dolphinscheduler.conf** is the Api Server service. address -  3, if the above configuration is correct, then please check if the Api Server service is normal, curl http://192.168.xx.xx:12345/escheduler/users/get-user-info, check the Api Server log, if Prompt cn.escheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null, which proves that the Api Server service is normal. +  3, if the above configuration is correct, then please check if the Api Server service is normal, curl http://192.168.xx.xx:12345/dolphinscheduler/users/get-user-info, check the Api Server log, if Prompt cn.dolphinscheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null, which proves that the Api Server service is normal. 4, if there is no problem above, you need to check if **server.context-path and server.port configuration** in **application.properties** is correct @@ -84,7 +84,7 @@ A: 1, if it is node startup, check whether the .env API_BASE configuration under A: 1, first **check whether the MasterServer service exists through jps**, or directly check whether there is a master service in zk from the service monitoring. -​ 2,If there is a master service, check **the command status statistics** or whether new records are added in **t_escheduler_error_command**. If it is added, **please check the message field.** +​ 2,If there is a master service, check **the command status statistics** or whether new records are added in **t_dolphinscheduler_error_command**. If it is added, **please check the message field.** --- @@ -102,9 +102,9 @@ A: 1, **first check whether the WorkerServer service exists through jps**, or A: Provide Docker image and Dockerfile. -Docker image address: https://hub.docker.com/r/escheduler/escheduler_images +Docker image address: https://hub.docker.com/r/dolphinscheduler/dolphinscheduler_images -Dockerfile address: https://github.com/qiaozhanwei/escheduler_dockerfile/tree/master/docker_escheduler +Dockerfile address: https://github.com/qiaozhanwei/dolphinscheduler_dockerfile/tree/master/docker_dolphinscheduler ------ @@ -112,9 +112,9 @@ Dockerfile address: https://github.com/qiaozhanwei/escheduler_dockerfile/tree/ma A: 1, if the replacement variable contains special characters, **use the \ transfer character to transfer** -​ 2, installPath="/data1_1T/escheduler", **this directory can not be the same as the install.sh directory currently installed with one click.** +​ 2, installPath="/data1_1T/dolphinscheduler", **this directory can not be the same as the install.sh directory currently installed with one click.** -​ 3, deployUser = "escheduler", **the deployment user must have sudo privileges**, because the worker is executed by sudo -u tenant sh xxx.command +​ 3, deployUser = "dolphinscheduler", **the deployment user must have sudo privileges**, because the worker is executed by sudo -u tenant sh xxx.command ​ 4, monitorServerState = "false", whether the service monitoring script is started, the default is not to start the service monitoring script. **If the service monitoring script is started, the master and worker services are monitored every 5 minutes, and if the machine is down, it will automatically restart.** @@ -126,7 +126,7 @@ A: 1, if the replacement variable contains special characters, **use the \ tra ## Q : Process definition and process instance offline exception -A : For **versions prior to 1.0.4**, modify the code under the escheduler-api cn.escheduler.api.quartz package. +A : For **versions prior to 1.0.4**, modify the code under the dolphinscheduler-api cn.dolphinscheduler.api.quartz package. ``` public boolean deleteJob(String jobName, String jobGroupName) { @@ -207,7 +207,7 @@ A: 1, in **the process definition list**, click the **Start** button. ## Q : Python task setting Python version -A： 1，**for the version after 1.0.3** only need to modify PYTHON_HOME in conf/env/.escheduler_env.sh +A： 1，**for the version after 1.0.3** only need to modify PYTHON_HOME in conf/env/.dolphinscheduler_env.sh ``` export PYTHON_HOME=/bin/python diff --git a/docs/en_US/SUMMARY.md b/docs/en_US/SUMMARY.md index 397a4a110c..63be19a451 100644 --- a/docs/en_US/SUMMARY.md +++ b/docs/en_US/SUMMARY.md @@ -34,7 +34,7 @@ * Backend development documentation * [Environmental requirements](backend-development.md#Environmental requirements) * [Project compilation](backend-development.md#Project compilation) -* [Interface documentation](http://52.82.13.76:8888/escheduler/doc.html?language=en_US&lang=en) +* [Interface documentation](http://52.82.13.76:8888/dolphinscheduler/doc.html?language=en_US&lang=en) * FAQ * [FAQ](EasyScheduler-FAQ.md) * EasyScheduler upgrade documentation diff --git a/docs/en_US/backend-deployment.md b/docs/en_US/backend-deployment.md index 934a005f6b..68c8b4bd9a 100644 --- a/docs/en_US/backend-deployment.md +++ b/docs/en_US/backend-deployment.md @@ -7,7 +7,7 @@ There are two deployment modes for the backend: ## Preparations -Download the latest version of the installation package, download address： [gitee download](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) or [github download](https://github.com/analysys/EasyScheduler/releases), download escheduler-backend-x.x.x.tar.gz(back-end referred to as escheduler-backend),escheduler-ui-x.x.x.tar.gz(front-end referred to as escheduler-ui) +Download the latest version of the installation package, download address： [gitee download](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) or [github download](https://github.com/apache/incubator-dolphinscheduler/releases), download dolphinscheduler-backend-x.x.x.tar.gz(back-end referred to as dolphinscheduler-backend),dolphinscheduler-ui-x.x.x.tar.gz(front-end referred to as dolphinscheduler-ui) @@ -32,8 +32,8 @@ Download the latest version of the installation package, download address： [gi ``` vi /etc/sudoers -# For example, the deployment user is an escheduler account -escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL +# For example, the deployment user is an dolphinscheduler account +dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL # And you need to comment out the Default requiretty line #Default requiretty @@ -51,9 +51,9 @@ Configure SSH secret-free login on deployment machines and other installation ma Execute the following command to create database and account ``` - CREATE DATABASE escheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; - GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}'; - GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}'; + CREATE DATABASE dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; + GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}'; + GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}'; flush privileges; ``` @@ -69,12 +69,12 @@ Configure SSH secret-free login on deployment machines and other installation ma Execute scripts for creating tables and importing basic data ``` - sh ./script/create-escheduler.sh + sh ./script/create-dolphinscheduler.sh ``` #### Preparations 5: Modify the deployment directory permissions and operation parameters - instruction of escheduler-backend directory + instruction of dolphinscheduler-backend directory ```directory bin : Basic service startup script @@ -85,11 +85,11 @@ sql : The project relies on SQL files install.sh : One-click deployment script ``` -- Modify permissions (please modify the 'deployUser' to the corresponding deployment user) so that the deployment user has operational privileges on the escheduler-backend directory +- Modify permissions (please modify the 'deployUser' to the corresponding deployment user) so that the deployment user has operational privileges on the dolphinscheduler-backend directory - `sudo chown -R deployUser:deployUser escheduler-backend` + `sudo chown -R deployUser:deployUser dolphinscheduler-backend` -- Modify the `.escheduler_env.sh` environment variable in the conf/env/directory +- Modify the `.dolphinscheduler_env.sh` environment variable in the conf/env/directory - Modify deployment parameters (depending on your server and business situation): @@ -132,11 +132,11 @@ After successful deployment, the log can be viewed and stored in a specified fol ```logPath logs/ - ├── escheduler-alert-server.log - ├── escheduler-master-server.log - |—— escheduler-worker-server.log - |—— escheduler-api-server.log - |—— escheduler-logger-server.log + ├── dolphinscheduler-alert-server.log + ├── dolphinscheduler-master-server.log + |—— dolphinscheduler-worker-server.log + |—— dolphinscheduler-api-server.log + |—— dolphinscheduler-logger-server.log ``` ### Compile source code to deploy @@ -151,7 +151,7 @@ After downloading the release version of the source package, unzip it into the r * View directory -After normal compilation, ./target/escheduler-{version}/ is generated in the current directory +After normal compilation, ./target/dolphinscheduler-{version}/ is generated in the current directory ### Start-and-stop services commonly used in systems (for service purposes, please refer to System Architecture Design for details) @@ -167,41 +167,41 @@ After normal compilation, ./target/escheduler-{version}/ is generated in the cur * start and stop one master server ```master -sh ./bin/escheduler-daemon.sh start master-server -sh ./bin/escheduler-daemon.sh stop master-server +sh ./bin/dolphinscheduler-daemon.sh start master-server +sh ./bin/dolphinscheduler-daemon.sh stop master-server ``` * start and stop one worker server ```worker -sh ./bin/escheduler-daemon.sh start worker-server -sh ./bin/escheduler-daemon.sh stop worker-server +sh ./bin/dolphinscheduler-daemon.sh start worker-server +sh ./bin/dolphinscheduler-daemon.sh stop worker-server ``` * start and stop api server ```Api -sh ./bin/escheduler-daemon.sh start api-server -sh ./bin/escheduler-daemon.sh stop api-server +sh ./bin/dolphinscheduler-daemon.sh start api-server +sh ./bin/dolphinscheduler-daemon.sh stop api-server ``` * start and stop logger server ```Logger -sh ./bin/escheduler-daemon.sh start logger-server -sh ./bin/escheduler-daemon.sh stop logger-server +sh ./bin/dolphinscheduler-daemon.sh start logger-server +sh ./bin/dolphinscheduler-daemon.sh stop logger-server ``` * start and stop alert server ```Alert -sh ./bin/escheduler-daemon.sh start alert-server -sh ./bin/escheduler-daemon.sh stop alert-server +sh ./bin/dolphinscheduler-daemon.sh start alert-server +sh ./bin/dolphinscheduler-daemon.sh stop alert-server ``` ## Database Upgrade Database upgrade is a function added in version 1.0.2. The database can be upgraded automatically by executing the following command: ```upgrade -sh ./script/upgrade-escheduler.sh +sh ./script/upgrade-dolphinscheduler.sh ``` diff --git a/docs/en_US/backend-development.md b/docs/en_US/backend-development.md index 10f7ba47f6..b287fad7bc 100644 --- a/docs/en_US/backend-development.md +++ b/docs/en_US/backend-development.md @@ -7,7 +7,7 @@ * [ZooKeeper](https://mirrors.tuna.tsinghua.edu.cn/apache/zookeeper)(3.4.6+) ：Must be installed * [Maven](http://maven.apache.org/download.cgi)(3.3+) ：Must be installed -Because the escheduler-rpc module in EasyScheduler uses Grpc, you need to use Maven to compile the generated classes. +Because the dolphinscheduler-rpc module in EasyScheduler uses Grpc, you need to use Maven to compile the generated classes. For those who are not familiar with maven, please refer to: [maven in five minutes](http://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)(3.3+) http://maven.apache.org/install.html @@ -23,7 +23,7 @@ After importing the EasyScheduler source code into the development tools such as * View directory -After normal compilation, it will generate ./target/escheduler-{version}/ in the current directory. +After normal compilation, it will generate ./target/dolphinscheduler-{version}/ in the current directory. ``` bin diff --git a/docs/en_US/frontend-deployment.md b/docs/en_US/frontend-deployment.md index 919caf1485..d2a3cda0bb 100644 --- a/docs/en_US/frontend-deployment.md +++ b/docs/en_US/frontend-deployment.md @@ -10,7 +10,7 @@ The front-end has three deployment modes: automated deployment, manual deploymen Please download the latest version of the installation package, download address： [gitee](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) -After downloading escheduler-ui-x.x.x.tar.gz，decompress`tar -zxvf escheduler-ui-x.x.x.tar.gz ./`and enter the`escheduler-ui`directory +After downloading dolphinscheduler-ui-x.x.x.tar.gz，decompress`tar -zxvf dolphinscheduler-ui-x.x.x.tar.gz ./`and enter the`dolphinscheduler-ui`directory @@ -21,7 +21,7 @@ Automated deployment is recommended for either of the following two ways ### Automated Deployment -Edit the installation file`vi install-escheduler-ui.sh` in the` escheduler-ui` directory +Edit the installation file`vi install-dolphinscheduler-ui.sh` in the` dolphinscheduler-ui` directory Change the front-end access port and the back-end proxy interface address @@ -35,7 +35,7 @@ esc_proxy_port="http://192.168.xx.xx:12345" >Front-end automatic deployment based on Linux system `yum` operation, before deployment, please install and update`yum` -under this directory, execute`./install-escheduler-ui.sh` +under this directory, execute`./install-dolphinscheduler-ui.sh` ### Manual Deployment @@ -63,7 +63,7 @@ server { root /xx/dist; # the dist directory address decompressed by the front end above (self-modifying) index index.html index.html; } - location /escheduler { + location /dolphinscheduler { proxy_pass http://192.168.xx.xx:12345; # interface address (self-modifying) proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docs/en_US/frontend-development.md b/docs/en_US/frontend-development.md index 286c598dbc..bb3e464fb7 100644 --- a/docs/en_US/frontend-development.md +++ b/docs/en_US/frontend-development.md @@ -23,7 +23,7 @@ Node package download (note version 8.9.4) `https://nodejs.org/download/release/ - #### Front-end project construction -Use the command line mode `cd` enter the `escheduler-ui` project directory and execute `npm install` to pull the project dependency package. +Use the command line mode `cd` enter the `dolphinscheduler-ui` project directory and execute `npm install` to pull the project dependency package. > If `npm install` is very slow @@ -34,7 +34,7 @@ Use the command line mode `cd` enter the `escheduler-ui` project directory and - Create a new `.env` file or the interface that interacts with the backend -Create a new` .env` file in the `escheduler-ui `directory, add the ip address and port of the backend service to the file, and use it to interact with the backend. The contents of the` .env` file are as follows: +Create a new` .env` file in the `dolphinscheduler-ui `directory, add the ip address and port of the backend service to the file, and use it to interact with the backend. The contents of the` .env` file are as follows: ``` # Proxy interface address (modified by yourself) API_BASE = http://192.168.xx.xx:12345 @@ -67,7 +67,7 @@ Visit address` http://localhost:8888/#/` Install pm2 `npm install -g pm2` -Execute `pm2 start npm -- run dev` to start the project in the project `escheduler-ui `root directory +Execute `pm2 start npm -- run dev` to start the project in the project `dolphinscheduler-ui `root directory #### command @@ -81,7 +81,7 @@ Execute `pm2 start npm -- run dev` to start the project in the project `eschedul ``` -[root@localhost escheduler-ui]# pm2 start npm -- run dev +[root@localhost dolphinscheduler-ui]# pm2 start npm -- run dev [PM2] Applying action restartProcessId on app [npm](ids: 0) [PM2] [npm](0) ✓ [PM2] Process successfully started diff --git a/docs/en_US/quick-start.md b/docs/en_US/quick-start.md index a1dc255345..b4dce0ea5f 100644 --- a/docs/en_US/quick-start.md +++ b/docs/en_US/quick-start.md @@ -2,7 +2,7 @@ * Administrator user login - > Address：192.168.xx.xx:8888 Username and password：admin/escheduler123 + > Address：192.168.xx.xx:8888 Username and password：admin/dolphinscheduler123

diff --git a/docs/en_US/system-manual.md b/docs/en_US/system-manual.md index d571e1d66f..751420c2d4 100644 --- a/docs/en_US/system-manual.md +++ b/docs/en_US/system-manual.md @@ -331,7 +331,7 @@ conf/common/hadoop.properties ## Security - The security has the functions of queue management, tenant management, user management, warning group management, worker group manager, token manage and other functions. It can also authorize resources, data sources, projects, etc. -- Administrator login, default username password: admin/escheduler 123 +- Administrator login, default username password: admin/dolphinscheduler123 @@ -391,7 +391,7 @@ conf/common/hadoop.properties CloseableHttpClient httpclient = HttpClients.createDefault(); // create http post request - HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create"); + HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/dolphinscheduler/projects/create"); httpPost.setHeader("token", "123"); // set parameters List parameters = new ArrayList(); diff --git a/docs/en_US/upgrade.md b/docs/en_US/upgrade.md index b5c743fd84..28af7d0703 100644 --- a/docs/en_US/upgrade.md +++ b/docs/en_US/upgrade.md @@ -3,13 +3,13 @@ ## 1. Back up the previous version of the files and database -## 2. Stop all services of escheduler +## 2. Stop all services of dolphinscheduler `sh ./script/stop-all.sh` ## 3. Download the new version of the installation package -- [gitee](https://gitee.com/easyscheduler/EasyScheduler/attach_files), download the latest version of the front and back installation packages (backend referred to as escheduler-backend, front end referred to as escheduler-ui) +- [gitee](https://gitee.com/easyscheduler/EasyScheduler/attach_files), download the latest version of the front and back installation packages (backend referred to as dolphinscheduler-backend, front end referred to as dolphinscheduler-ui) - The following upgrade operations need to be performed in the new version of the directory ## 4. Database upgrade @@ -23,7 +23,7 @@ - Execute database upgrade script -`sh ./script/upgrade-escheduler.sh` +`sh ./script/upgrade-dolphinscheduler.sh` ## 5. Backend service upgrade diff --git a/docs/zh_CN/EasyScheduler-FAQ.md b/docs/zh_CN/EasyScheduler-FAQ.md index 360565a4ee..a4419a4c00 100644 --- a/docs/zh_CN/EasyScheduler-FAQ.md +++ b/docs/zh_CN/EasyScheduler-FAQ.md @@ -50,7 +50,7 @@ A：我们同时 **支持流程和任务的优先级**。优先级我们有 **HI ---- -## Q：escheduler-grpc报错 +## Q：dolphinscheduler-grpc报错 A：在根目录下执行：mvn -U clean package assembly:assembly -Dmaven.test.skip=true ， 然后刷新下整个项目 @@ -70,11 +70,11 @@ A：单独安装 **npm install node-sass --unsafe-perm**，之后再 **npm insta ## Q：UI 不能正常登陆访问 -A： 1，如果是node启动的查看escheduler-ui下的.env API_BASE配置是否是Api Server服务地址 +A： 1，如果是node启动的查看dolphinscheduler-ui下的.env API_BASE配置是否是Api Server服务地址 - 2，如果是nginx启动的并且是通过 **install-escheduler-ui.sh** 安装的，查看 **/etc/nginx/conf.d/escheduler.conf** 中的proxy_pass配置是否是Api Server服务地址 + 2，如果是nginx启动的并且是通过 **install-dolphinscheduler-ui.sh** 安装的，查看 **/etc/nginx/conf.d/dolphinscheduler.conf** 中的proxy_pass配置是否是Api Server服务地址 - 3，如果以上配置都是正确的，那么请查看Api Server服务是否是正常的，curl http://192.168.xx.xx:12345/escheduler/users/get-user-info，查看Api Server日志，如果提示 cn.escheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null，则证明Api Server服务是正常的 + 3，如果以上配置都是正确的，那么请查看Api Server服务是否是正常的，curl http://192.168.xx.xx:12345/dolphinscheduler/users/get-user-info，查看Api Server日志，如果提示 cn.dolphinscheduler.api.interceptor.LoginHandlerInterceptor:[76] - session info is null，则证明Api Server服务是正常的 4，如果以上都没有问题，需要查看一下 **application.properties** 中的 **server.context-path 和 server.port 配置**是否正确 @@ -84,7 +84,7 @@ A： 1，如果是node启动的查看escheduler-ui下的.env API_BASE配置是 A： 1，首先通过**jps 查看MasterServer服务是否存在**，或者从服务监控直接查看zk中是否存在master服务 -​ 2，如果存在master服务，查看 **命令状态统计** 或者 **t_escheduler_error_command** 中是否增加的新记录，如果增加了，**请查看 message 字段定位启动异常原因** +​ 2，如果存在master服务，查看 **命令状态统计** 或者 **t_dolphinscheduler_error_command** 中是否增加的新记录，如果增加了，**请查看 message 字段定位启动异常原因** --- @@ -102,9 +102,9 @@ A： 1，首先通过**jps 查看WorkerServer服务是否存在**，或者从服 A： 提供Docker镜像及Dockerfile。 -Docker镜像地址：https://hub.docker.com/r/escheduler/escheduler_images +Docker镜像地址：https://hub.docker.com/r/dolphinscheduler/dolphinscheduler_images -Dockerfile地址：https://github.com/qiaozhanwei/escheduler_dockerfile/tree/master/docker_escheduler +Dockerfile地址：https://github.com/qiaozhanwei/dolphinscheduler_dockerfile/tree/master/docker_dolphinscheduler --- @@ -112,9 +112,9 @@ Dockerfile地址：https://github.com/qiaozhanwei/escheduler_dockerfile/tree/mas A： 1，如果替换变量中包含特殊字符，**请用 \ 转移符进行转移** -​ 2，installPath="/data1_1T/escheduler"，**这个目录不能和当前要一键安装的install.sh目录是一样的** +​ 2，installPath="/data1_1T/dolphinscheduler"，**这个目录不能和当前要一键安装的install.sh目录是一样的** -​ 3，deployUser="escheduler"，**部署用户必须具有sudo权限**，因为worker是通过sudo -u 租户 sh xxx.command进行执行的 +​ 3，deployUser="dolphinscheduler"，**部署用户必须具有sudo权限**，因为worker是通过sudo -u 租户 sh xxx.command进行执行的 ​ 4，monitorServerState="false"，服务监控脚本是否启动，默认是不启动服务监控脚本的。**如果启动服务监控脚本，则每5分钟定时来监控master和worker的服务是否down机，如果down机则会自动重启** @@ -126,7 +126,7 @@ A： 1，如果替换变量中包含特殊字符，**请用 \ 转移符进行 ## Q ： 流程定义和流程实例下线异常 -A ： 对于 **1.0.4 以前的版本中**，修改escheduler-api cn.escheduler.api.quartz包下的代码即可 +A ： 对于 **1.0.4 以前的版本中**，修改dolphinscheduler-api cn.dolphinscheduler.api.quartz包下的代码即可 ``` public boolean deleteJob(String jobName, String jobGroupName) { @@ -205,7 +205,7 @@ A： 1，在 **流程定义列表**，点击 **启动** 按钮 ## Q ： Python任务设置Python版本 -A： 1，对于1**.0.3之后的版本**只需要修改 conf/env/.escheduler_env.sh中的PYTHON_HOME +A： 1，对于1**.0.3之后的版本**只需要修改 conf/env/.dolphinscheduler_env.sh中的PYTHON_HOME ``` export PYTHON_HOME=/bin/python diff --git a/docs/zh_CN/SUMMARY.md b/docs/zh_CN/SUMMARY.md index 2b153b60c5..06d17b9215 100644 --- a/docs/zh_CN/SUMMARY.md +++ b/docs/zh_CN/SUMMARY.md @@ -29,7 +29,7 @@ * [开发环境搭建](后端开发文档.md#项目编译) * [自定义任务插件文档](任务插件开发.md#任务插件开发) -* [接口文档](http://52.82.13.76:8888/escheduler/doc.html?language=zh_CN&lang=cn) +* [接口文档](http://52.82.13.76:8888/dolphinscheduler/doc.html?language=zh_CN&lang=cn) * FAQ * [FAQ](EasyScheduler-FAQ.md) * 系统版本升级文档 diff --git a/docs/zh_CN/任务插件开发.md b/docs/zh_CN/任务插件开发.md index 5e733b9540..0157735974 100644 --- a/docs/zh_CN/任务插件开发.md +++ b/docs/zh_CN/任务插件开发.md @@ -6,8 +6,8 @@ #### 基于YARN的计算（参见MapReduceTask） -- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 类中创建自定义任务(也需在TaskType注册对应的任务类型) -- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractYarnTask** +- 需要在 **org.apache.dolphinscheduler.server.worker.task** 下的 **TaskManager** 类中创建自定义任务(也需在TaskType注册对应的任务类型) +- 需要继承**org.apache.dolphinscheduler.server.worker.task** 下的 **AbstractYarnTask** - 构造方法调度 **AbstractYarnTask** 构造方法 - 继承 **AbstractParameters** 自定义任务参数实体 - 重写 **AbstractTask** 的 **init** 方法中解析**自定义任务参数** @@ -16,9 +16,9 @@ #### 基于非YARN的计算（参见ShellTask） -- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务 +- 需要在 **org.apache.dolphinscheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务 -- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractTask** +- 需要继承**org.apache.dolphinscheduler.server.worker.task** 下的 **AbstractTask** - 构造方法中实例化 **ShellCommandExecutor** @@ -46,8 +46,8 @@ ### 基于非SHELL的任务（参见SqlTask） -- 需要在 **cn.escheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务 -- 需要继承**cn.escheduler.server.worker.task** 下的 **AbstractTask** +- 需要在 **org.apache.dolphinscheduler.server.worker.task** 下的 **TaskManager** 中创建自定义任务 +- 需要继承**org.apache.dolphinscheduler.server.worker.task** 下的 **AbstractTask** - 继承 **AbstractParameters** 自定义任务参数实体 - 构造方法或者重写 **AbstractTask** 的 **init** 方法中，解析自定义任务参数实体 - 重写 **handle** 方法实现业务逻辑并设置相应的**exitStatusCode** diff --git a/docs/zh_CN/前端开发文档.md b/docs/zh_CN/前端开发文档.md index f805f5ed8c..4d5cea11f3 100644 --- a/docs/zh_CN/前端开发文档.md +++ b/docs/zh_CN/前端开发文档.md @@ -23,7 +23,7 @@ Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/` - #### 前端项目构建 -用命令行模式 `cd` 进入 `escheduler-ui`项目目录并执行 `npm install` 拉取项目依赖包 +用命令行模式 `cd` 进入 `dolphinscheduler-ui`项目目录并执行 `npm install` 拉取项目依赖包 > 如果 `npm install` 速度非常慢 @@ -34,7 +34,7 @@ Node包下载 (注意版本 8.9.4) `https://nodejs.org/download/release/v8.9.4/` - 新建一个`.env`文件，用于跟后端交互的接口 -在`escheduler-ui`目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下： +在`dolphinscheduler-ui`目录下新建一个`.env`文件，在文件里添加后端服务的ip地址和端口，用于跟后端交互，`.env`文件内容如下： ``` # 代理的接口地址（自行修改） API_BASE = http://192.168.xx.xx:12345 @@ -68,7 +68,7 @@ npm install node-sass --unsafe-perm //单独安装node-sass依赖 安装pm2 `npm install -g pm2` -在项目`escheduler-ui`根目录执行 `pm2 start npm -- run dev` 启动项目 +在项目`dolphinscheduler-ui`根目录执行 `pm2 start npm -- run dev` 启动项目 #### 命令 @@ -82,7 +82,7 @@ npm install node-sass --unsafe-perm //单独安装node-sass依赖 ``` -[root@localhost escheduler-ui]# pm2 start npm -- run dev +[root@localhost dolphinscheduler-ui]# pm2 start npm -- run dev [PM2] Applying action restartProcessId on app [npm](ids: 0) [PM2] [npm](0) ✓ [PM2] Process successfully started diff --git a/docs/zh_CN/前端部署文档.md b/docs/zh_CN/前端部署文档.md index dc9cf61216..8bb7324531 100644 --- a/docs/zh_CN/前端部署文档.md +++ b/docs/zh_CN/前端部署文档.md @@ -7,7 +7,7 @@ 请下载最新版本的安装包，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/) 或者 [github下载](https://github.com/analysys/EasyScheduler/releases) -下载 escheduler-ui-x.x.x.tar.gz 后，解压`tar -zxvf escheduler-ui-x.x.x.tar.gz ./`后，进入`escheduler-ui`目录 +下载 dolphinscheduler-ui-x.x.x.tar.gz 后，解压`tar -zxvf dolphinscheduler-ui-x.x.x.tar.gz ./`后，进入`dolphinscheduler-ui`目录 @@ -16,7 +16,7 @@ 以下两种方式任选其一部署即可，推荐自动化部署 ### 2.1 自动化部署 -在`escheduler-ui`目录下编辑安装文件`vi install-escheduler-ui.sh` +在`dolphinscheduler-ui`目录下编辑安装文件`vi install-dolphinscheduler-ui.sh` 更改前端访问端口和后端代理接口地址 @@ -30,7 +30,7 @@ esc_proxy_port="http://192.168.xx.xx:12345" >前端自动部署基于linux系统`yum`操作，部署之前请先安装更新`yum` -在该目录下执行`./install-escheduler-ui.sh` +在该目录下执行`./install-dolphinscheduler-ui.sh` ### 2.2 手动部署 @@ -55,7 +55,7 @@ server { root /xx/dist; # 上面前端解压的dist目录地址(自行修改) index index.html index.html; } - location /escheduler { + location /dolphinscheduler { proxy_pass http://192.168.xx.xx:12345; # 接口地址(自行修改) proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/docs/zh_CN/升级文档.md b/docs/zh_CN/升级文档.md index 83166971fc..b2d9c29cfe 100644 --- a/docs/zh_CN/升级文档.md +++ b/docs/zh_CN/升级文档.md @@ -3,13 +3,13 @@ ## 1. 备份上一版本文件和数据库 -## 2. 停止escheduler所有服务 +## 2. 停止dolphinscheduler所有服务 `sh ./script/stop-all.sh` ## 3. 下载新版本的安装包 -- [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files), 下载最新版本的前后端安装包(后端简称escheduler-backend、前端简称escheduler-ui) +- [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files), 下载最新版本的前后端安装包(后端简称dolphinscheduler-backend、前端简称dolphinscheduler-ui) - 以下升级操作都需要在新版本的目录进行 ## 4. 数据库升级 @@ -23,7 +23,7 @@ - 执行数据库升级脚本 -`sh ./script/upgrade-escheduler.sh` +`sh ./script/upgrade-dolphinscheduler.sh` ## 5. 后端服务升级 diff --git a/docs/zh_CN/后端开发文档.md b/docs/zh_CN/后端开发文档.md index 7d2d34a0a0..6159f85c0a 100644 --- a/docs/zh_CN/后端开发文档.md +++ b/docs/zh_CN/后端开发文档.md @@ -7,7 +7,7 @@ * [ZooKeeper](https://mirrors.tuna.tsinghua.edu.cn/apache/zookeeper)(3.4.6+) ：必装 * [Maven](http://maven.apache.org/download.cgi)(3.3+) ：必装 -因EasyScheduler中escheduler-rpc模块使用到Grpc，需要用到Maven编译生成所需要的类 +因EasyScheduler中dolphinscheduler-rpc模块使用到Grpc，需要用到Maven编译生成所需要的类 对maven不熟的伙伴请参考: [maven in five minutes](http://maven.apache.org/guides/getting-started/maven-in-five-minutes.html)(3.3+) http://maven.apache.org/install.html @@ -23,7 +23,7 @@ http://maven.apache.org/install.html * 查看目录 -正常编译完后，会在当前目录生成 ./target/escheduler-{version}/ +正常编译完后，会在当前目录生成 ./target/dolphinscheduler-{version}/ ``` bin diff --git a/docs/zh_CN/后端部署文档.md b/docs/zh_CN/后端部署文档.md index bf217880a5..525b0e7f8a 100644 --- a/docs/zh_CN/后端部署文档.md +++ b/docs/zh_CN/后端部署文档.md @@ -4,7 +4,7 @@ ## 1、准备工作 -请下载最新版本的安装包，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)或者[github下载](https://github.com/analysys/EasyScheduler/releases) ，下载escheduler-backend-x.x.x.tar.gz(后端简称escheduler-backend),escheduler-ui-x.x.x.tar.gz(前端简称escheduler-ui) +请下载最新版本的安装包，下载地址： [码云下载](https://gitee.com/easyscheduler/EasyScheduler/attach_files/)或者[github下载](https://github.com/apache/incubator-dolphinscheduler/releases) ，下载dolphinscheduler-backend-x.x.x.tar.gz(后端简称dolphinscheduler-backend),dolphinscheduler-ui-x.x.x.tar.gz(前端简称dolphinscheduler-ui) #### 准备一: 基础软件安装(必装项请自行安装) @@ -27,8 +27,8 @@ ```部署账号 vi /etc/sudoers -# 例如部署用户是escheduler账号 -escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL +# 例如部署用户是dolphinscheduler账号 +dolphinscheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL # 并且需要注释掉 Default requiretty 一行 #Default requiretty @@ -47,9 +47,9 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL 执行以下命令创建database和账号 ```sql - CREATE DATABASE escheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; - GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}'; - GRANT ALL PRIVILEGES ON escheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}'; + CREATE DATABASE dolphinscheduler DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; + GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'%' IDENTIFIED BY '{password}'; + GRANT ALL PRIVILEGES ON dolphinscheduler.* TO '{user}'@'localhost' IDENTIFIED BY '{password}'; flush privileges; ``` @@ -63,12 +63,12 @@ escheduler ALL=(ALL) NOPASSWD: NOPASSWD: ALL ``` 执行创建表和导入基础数据脚本 ``` - sh ./script/create-escheduler.sh + sh ./script/create-dolphinscheduler.sh ``` #### 准备五: 修改部署目录权限及运行参数 - escheduler-backend目录介绍 + dolphinscheduler-backend目录介绍 ``` bin : 基础服务启动脚本 @@ -79,11 +79,11 @@ sql : 项目依赖sql文件 install.sh : 一键部署脚本 ``` -- 修改权限(请将'deployUser'字段修改为对应部署用户)，使得部署用户对escheduler-backend目录有操作权限 +- 修改权限(请将'deployUser'字段修改为对应部署用户)，使得部署用户对dolphinscheduler-backend目录有操作权限 - `sudo chown -R deployUser:deployUser escheduler-backend` + `sudo chown -R deployUser:deployUser dolphinscheduler-backend` -- 修改conf/env/目录下的 `.escheduler_env.sh` 环境变量 +- 修改conf/env/目录下的 `.dolphinscheduler_env.sh` 环境变量 - 修改部署参数(根据自己服务器及业务情况): @@ -127,11 +127,11 @@ install.sh : 一键部署脚本 ```日志路径 logs/ - ├── escheduler-alert-server.log - ├── escheduler-master-server.log - |—— escheduler-worker-server.log - |—— escheduler-api-server.log - |—— escheduler-logger-server.log + ├── dolphinscheduler-alert-server.log + ├── dolphinscheduler-master-server.log + |—— dolphinscheduler-worker-server.log + |—— dolphinscheduler-api-server.log + |—— dolphinscheduler-logger-server.log ``` ### 2.2 编译源码来部署 @@ -146,7 +146,7 @@ install.sh : 一键部署脚本 * 查看目录 -正常编译完后，会在当前目录生成 `./target/escheduler-{version}/` +正常编译完后，会在当前目录生成 `./target/dolphinscheduler-{version}/` ```查看目录 ../ @@ -173,38 +173,38 @@ install.sh : 一键部署脚本 * 启停Master ```启动master -sh ./bin/escheduler-daemon.sh start master-server -sh ./bin/escheduler-daemon.sh stop master-server +sh ./bin/dolphinscheduler-daemon.sh start master-server +sh ./bin/dolphinscheduler-daemon.sh stop master-server ``` * 启停Worker ``` -sh ./bin/escheduler-daemon.sh start worker-server -sh ./bin/escheduler-daemon.sh stop worker-server +sh ./bin/dolphinscheduler-daemon.sh start worker-server +sh ./bin/dolphinscheduler-daemon.sh stop worker-server ``` * 启停Api ``` -sh ./bin/escheduler-daemon.sh start api-server -sh ./bin/escheduler-daemon.sh stop api-server +sh ./bin/dolphinscheduler-daemon.sh start api-server +sh ./bin/dolphinscheduler-daemon.sh stop api-server ``` * 启停Logger ``` -sh ./bin/escheduler-daemon.sh start logger-server -sh ./bin/escheduler-daemon.sh stop logger-server +sh ./bin/dolphinscheduler-daemon.sh start logger-server +sh ./bin/dolphinscheduler-daemon.sh stop logger-server ``` * 启停Alert ``` -sh ./bin/escheduler-daemon.sh start alert-server -sh ./bin/escheduler-daemon.sh stop alert-server +sh ./bin/dolphinscheduler-daemon.sh start alert-server +sh ./bin/dolphinscheduler-daemon.sh stop alert-server ``` ## 3、数据库升级 数据库升级是在1.0.2版本增加的功能,执行以下命令即可自动升级数据库 ``` -sh ./script/upgrade-escheduler.sh +sh ./script/upgrade-dolphinscheduler.sh ``` diff --git a/docs/zh_CN/快速上手.md b/docs/zh_CN/快速上手.md index 966ef88e84..7aa4f6577c 100644 --- a/docs/zh_CN/快速上手.md +++ b/docs/zh_CN/快速上手.md @@ -1,7 +1,7 @@ # 快速上手 * 管理员用户登录 - >地址：192.168.xx.xx:8888 用户名密码：admin/escheduler123 + >地址：192.168.xx.xx:8888 用户名密码：admin/dolphinscheduler123

diff --git a/docs/zh_CN/系统使用手册.md b/docs/zh_CN/系统使用手册.md index 348cc2b36a..8ec5d0a5ea 100644 --- a/docs/zh_CN/系统使用手册.md +++ b/docs/zh_CN/系统使用手册.md @@ -323,7 +323,7 @@ conf/common/hadoop.properties ## 安全中心（权限系统） - 安全中心是只有管理员账户才有权限的功能，有队列管理、租户管理、用户管理、告警组管理、worker分组、令牌管理等功能，还可以对资源、数据源、项目等授权 - - 管理员登录，默认用户名密码：admin/escheduler123 + - 管理员登录，默认用户名密码：admin/dolphinscheduler123 ### 创建队列 - 队列是在执行spark、mapreduce等程序，需要用到“队列”参数时使用的。 @@ -379,7 +379,7 @@ conf/common/hadoop.properties CloseableHttpClient httpclient = HttpClients.createDefault(); // create http post request - HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/escheduler/projects/create"); + HttpPost httpPost = new HttpPost("http://127.0.0.1:12345/dolphinscheduler/projects/create"); httpPost.setHeader("token", "123"); // set parameters List parameters = new ArrayList(); diff --git a/escheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml similarity index 93% rename from escheduler-alert/pom.xml rename to dolphinscheduler-alert/pom.xml index 630c519fde..11dc7bd960 100644 --- a/escheduler-alert/pom.xml +++ b/dolphinscheduler-alert/pom.xml @@ -2,11 +2,11 @@ 4.0.0 - cn.analysys - escheduler + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT - escheduler-alert + dolphinscheduler-alert jar @@ -87,8 +87,8 @@ - cn.analysys - escheduler-dao + org.apache.dolphinscheduler + dolphinscheduler-dao diff --git a/escheduler-alert/src/main/assembly/package.xml b/dolphinscheduler-alert/src/main/assembly/package.xml similarity index 93% rename from escheduler-alert/src/main/assembly/package.xml rename to dolphinscheduler-alert/src/main/assembly/package.xml index 68a30262fa..b10f76c62b 100644 --- a/escheduler-alert/src/main/assembly/package.xml +++ b/dolphinscheduler-alert/src/main/assembly/package.xml @@ -21,7 +21,7 @@ target/ - escheduler-alert-${project.version}.jar + dolphinscheduler-alert-${project.version}.jar lib diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/AlertServer.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java similarity index 88% rename from escheduler-alert/src/main/java/cn/escheduler/alert/AlertServer.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java index fbffe4453f..3eba9fdbc8 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/AlertServer.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert; +package org.apache.dolphinscheduler.alert; -import cn.escheduler.alert.runner.AlertSender; -import cn.escheduler.alert.utils.Constants; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.alert.runner.AlertSender; +import org.apache.dolphinscheduler.alert.utils.Constants; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.entity.Alert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/EmailManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java similarity index 85% rename from escheduler-alert/src/main/java/cn/escheduler/alert/manager/EmailManager.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java index 0c50118526..957f195e1c 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/EmailManager.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EmailManager.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.manager; +package org.apache.dolphinscheduler.alert.manager; -import cn.escheduler.alert.utils.MailUtils; -import cn.escheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.alert.utils.MailUtils; +import org.apache.dolphinscheduler.common.enums.ShowType; import java.util.List; import java.util.Map; @@ -37,7 +37,7 @@ public class EmailManager { */ public Map send(List receviersList,List receviersCcList,String title,String content,ShowType showType){ - return MailUtils.sendMails(receviersList,receviersCcList,title, content, showType); + return MailUtils.sendMails(receviersList, receviersCcList, title, content, showType); } /** diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/EnterpriseWeChatManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java similarity index 89% rename from escheduler-alert/src/main/java/cn/escheduler/alert/manager/EnterpriseWeChatManager.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java index 426861925c..67f4fee7e0 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/EnterpriseWeChatManager.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/EnterpriseWeChatManager.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.manager; +package org.apache.dolphinscheduler.alert.manager; -import cn.escheduler.alert.utils.Constants; -import cn.escheduler.alert.utils.EnterpriseWeChatUtils; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.alert.utils.Constants; +import org.apache.dolphinscheduler.alert.utils.EnterpriseWeChatUtils; +import org.apache.dolphinscheduler.dao.entity.Alert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/MsgManager.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java similarity index 91% rename from escheduler-alert/src/main/java/cn/escheduler/alert/manager/MsgManager.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java index b2f8172991..35cc9bea3f 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/manager/MsgManager.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/manager/MsgManager.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.manager; +package org.apache.dolphinscheduler.alert.manager; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.dao.entity.Alert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java similarity index 88% rename from escheduler-alert/src/main/java/cn/escheduler/alert/runner/AlertSender.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java index 4ecdd2a51a..f7d73e0d77 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/runner/AlertSender.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.runner; +package org.apache.dolphinscheduler.alert.runner; -import cn.escheduler.alert.manager.EmailManager; -import cn.escheduler.alert.manager.EnterpriseWeChatManager; -import cn.escheduler.alert.utils.Constants; -import cn.escheduler.alert.utils.EnterpriseWeChatUtils; -import cn.escheduler.common.enums.AlertStatus; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.entity.Alert; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.alert.manager.EmailManager; +import org.apache.dolphinscheduler.alert.manager.EnterpriseWeChatManager; +import org.apache.dolphinscheduler.alert.utils.Constants; +import org.apache.dolphinscheduler.alert.utils.EnterpriseWeChatUtils; +import org.apache.dolphinscheduler.common.enums.AlertStatus; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java similarity index 99% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java index 9e551822bb..0a35d85fc4 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/Constants.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; /** * constants diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/EnterpriseWeChatUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java similarity index 87% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/EnterpriseWeChatUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java index dc066463fd..291ac5a82d 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/EnterpriseWeChatUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; -import cn.escheduler.common.enums.ShowType; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.dao.entity.Alert; import com.alibaba.fastjson.JSON; import com.google.common.reflect.TypeToken; @@ -36,8 +36,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.*; -import static cn.escheduler.alert.utils.PropertyUtils.getString; - /** * Enterprise WeChat utils */ @@ -45,24 +43,24 @@ public class EnterpriseWeChatUtils { public static final Logger logger = LoggerFactory.getLogger(EnterpriseWeChatUtils.class); - private static final String enterpriseWeChatCorpId = getString(Constants.ENTERPRISE_WECHAT_CORP_ID); + private static final String enterpriseWeChatCorpId = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_CORP_ID); - private static final String enterpriseWeChatSecret = getString(Constants.ENTERPRISE_WECHAT_SECRET); + private static final String enterpriseWeChatSecret = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_SECRET); - private static final String enterpriseWeChatTokenUrl = getString(Constants.ENTERPRISE_WECHAT_TOKEN_URL); + private static final String enterpriseWeChatTokenUrl = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_TOKEN_URL); private static String enterpriseWeChatTokenUrlReplace = enterpriseWeChatTokenUrl .replaceAll("\\$corpId", enterpriseWeChatCorpId) .replaceAll("\\$secret", enterpriseWeChatSecret); - private static final String enterpriseWeChatPushUrl = getString(Constants.ENTERPRISE_WECHAT_PUSH_URL); + private static final String enterpriseWeChatPushUrl = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_PUSH_URL); - private static final String enterpriseWeChatTeamSendMsg = getString(Constants.ENTERPRISE_WECHAT_TEAM_SEND_MSG); + private static final String enterpriseWeChatTeamSendMsg = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_TEAM_SEND_MSG); - private static final String enterpriseWeChatUserSendMsg = getString(Constants.ENTERPRISE_WECHAT_USER_SEND_MSG); + private static final String enterpriseWeChatUserSendMsg = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_USER_SEND_MSG); - public static final String enterpriseWeChatAgentId = getString(Constants.ENTERPRISE_WECHAT_AGENT_ID); + public static final String enterpriseWeChatAgentId = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_AGENT_ID); - public static final String enterpriseWeChatUsers = getString(Constants.ENTERPRISE_WECHAT_USERS); + public static final String enterpriseWeChatUsers = PropertyUtils.getString(Constants.ENTERPRISE_WECHAT_USERS); /** * get Enterprise WeChat token info diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/ExcelUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java similarity index 98% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/ExcelUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java index ef9fe61932..e033c775be 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/ExcelUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java similarity index 96% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java index c9dbe1d676..e682fde2e7 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; public class FuncUtils { diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/JSONUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/JSONUtils.java similarity index 97% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/JSONUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/JSONUtils.java index 6c1c468475..cab85c49e6 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/JSONUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/JSONUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java similarity index 91% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java index 82add04daf..607259c22b 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/MailUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; -import cn.escheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.common.enums.ShowType; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; @@ -33,12 +33,9 @@ import org.springframework.util.ResourceUtils; import javax.mail.*; import javax.mail.internet.*; import java.io.*; -import java.security.Security; import java.util.*; -import static cn.escheduler.alert.utils.PropertyUtils.getBoolean; -import static cn.escheduler.alert.utils.PropertyUtils.getInt; -import static cn.escheduler.alert.utils.PropertyUtils.getString; +import static org.apache.dolphinscheduler.alert.utils.PropertyUtils.getInt; /** @@ -48,29 +45,29 @@ public class MailUtils { public static final Logger logger = LoggerFactory.getLogger(MailUtils.class); - public static final String mailProtocol = getString(Constants.MAIL_PROTOCOL); + public static final String mailProtocol = PropertyUtils.getString(Constants.MAIL_PROTOCOL); - public static final String mailServerHost = getString(Constants.MAIL_SERVER_HOST); + public static final String mailServerHost = PropertyUtils.getString(Constants.MAIL_SERVER_HOST); - public static final Integer mailServerPort = getInt(Constants.MAIL_SERVER_PORT); + public static final Integer mailServerPort = PropertyUtils.getInt(Constants.MAIL_SERVER_PORT); - public static final String mailSender = getString(Constants.MAIL_SENDER); + public static final String mailSender = PropertyUtils.getString(Constants.MAIL_SENDER); - public static final String mailUser = getString(Constants.MAIL_USER); + public static final String mailUser = PropertyUtils.getString(Constants.MAIL_USER); - public static final String mailPasswd = getString(Constants.MAIL_PASSWD); + public static final String mailPasswd = PropertyUtils.getString(Constants.MAIL_PASSWD); - public static final Boolean mailUseStartTLS = getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE); + public static final Boolean mailUseStartTLS = PropertyUtils.getBoolean(Constants.MAIL_SMTP_STARTTLS_ENABLE); - public static final Boolean mailUseSSL = getBoolean(Constants.MAIL_SMTP_SSL_ENABLE); + public static final Boolean mailUseSSL = PropertyUtils.getBoolean(Constants.MAIL_SMTP_SSL_ENABLE); - public static final String xlsFilePath = getString(Constants.XLS_FILE_PATH); + public static final String xlsFilePath = PropertyUtils.getString(Constants.XLS_FILE_PATH); - public static final String starttlsEnable = getString(Constants.MAIL_SMTP_STARTTLS_ENABLE); + public static final String starttlsEnable = PropertyUtils.getString(Constants.MAIL_SMTP_STARTTLS_ENABLE); - public static final String sslEnable = getString(Constants.MAIL_SMTP_SSL_ENABLE); + public static final String sslEnable = PropertyUtils.getString(Constants.MAIL_SMTP_SSL_ENABLE); - public static final String sslTrust = getString(Constants.MAIL_SMTP_SSL_TRUST); + public static final String sslTrust = PropertyUtils.getString(Constants.MAIL_SMTP_SSL_TRUST); private static Template MAIL_TEMPLATE; diff --git a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/PropertyUtils.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java similarity index 95% rename from escheduler-alert/src/main/java/cn/escheduler/alert/utils/PropertyUtils.java rename to dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java index 3b31a28146..225e4df3c1 100644 --- a/escheduler-alert/src/main/java/cn/escheduler/alert/utils/PropertyUtils.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import static cn.escheduler.alert.utils.Constants.ALERT_PROPERTIES_PATH; -import static cn.escheduler.alert.utils.Constants.DATA_SOURCE_PROPERTIES_PATH; +import static org.apache.dolphinscheduler.alert.utils.Constants.ALERT_PROPERTIES_PATH; +import static org.apache.dolphinscheduler.alert.utils.Constants.DATA_SOURCE_PROPERTIES_PATH; /** * property utils diff --git a/escheduler-alert/src/main/resources/alert.properties b/dolphinscheduler-alert/src/main/resources/alert.properties similarity index 100% rename from escheduler-alert/src/main/resources/alert.properties rename to dolphinscheduler-alert/src/main/resources/alert.properties diff --git a/escheduler-alert/src/main/resources/alert_logback.xml b/dolphinscheduler-alert/src/main/resources/alert_logback.xml similarity index 84% rename from escheduler-alert/src/main/resources/alert_logback.xml rename to dolphinscheduler-alert/src/main/resources/alert_logback.xml index c4ca8e9d1f..2b617817e0 100644 --- a/escheduler-alert/src/main/resources/alert_logback.xml +++ b/dolphinscheduler-alert/src/main/resources/alert_logback.xml @@ -11,9 +11,9 @@ - ${log.base}/escheduler-alert.log + ${log.base}/dolphinscheduler-alert.log - ${log.base}/escheduler-alert.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log 20 64MB diff --git a/escheduler-alert/src/main/resources/application_alert.properties b/dolphinscheduler-alert/src/main/resources/application_alert.properties similarity index 100% rename from escheduler-alert/src/main/resources/application_alert.properties rename to dolphinscheduler-alert/src/main/resources/application_alert.properties diff --git a/escheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl b/dolphinscheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl similarity index 100% rename from escheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl rename to dolphinscheduler-alert/src/main/resources/mail_templates/alert_mail_template.ftl diff --git a/escheduler-alert/src/test/java/cn/escheduler/alert/utils/EnterpriseWeChatUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java similarity index 98% rename from escheduler-alert/src/test/java/cn/escheduler/alert/utils/EnterpriseWeChatUtilsTest.java rename to dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java index a226cf3f01..527d828e40 100644 --- a/escheduler-alert/src/test/java/cn/escheduler/alert/utils/EnterpriseWeChatUtilsTest.java +++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; import com.alibaba.fastjson.JSON; import org.junit.Assert; diff --git a/escheduler-alert/src/test/java/cn/escheduler/alert/utils/MailUtilsTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java similarity index 95% rename from escheduler-alert/src/test/java/cn/escheduler/alert/utils/MailUtilsTest.java rename to dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java index c7b6dd8670..7525256f9b 100644 --- a/escheduler-alert/src/test/java/cn/escheduler/alert/utils/MailUtilsTest.java +++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/MailUtilsTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.alert.utils; +package org.apache.dolphinscheduler.alert.utils; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.enums.ShowType; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.entity.Alert; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.dao.entity.User; import freemarker.cache.StringTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/escheduler-api/pom.xml b/dolphinscheduler-api/pom.xml similarity index 92% rename from escheduler-api/pom.xml rename to dolphinscheduler-api/pom.xml index 766993ca4e..2dd599c579 100644 --- a/escheduler-api/pom.xml +++ b/dolphinscheduler-api/pom.xml @@ -1,21 +1,21 @@ 4.0.0 - cn.analysys - escheduler + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT - escheduler-api + dolphinscheduler-api jar - cn.analysys - escheduler-alert + org.apache.dolphinscheduler + dolphinscheduler-alert - cn.analysys - escheduler-server + org.apache.dolphinscheduler + dolphinscheduler-server io.netty @@ -173,8 +173,8 @@ - cn.analysys - escheduler-rpc + org.apache.dolphinscheduler + dolphinscheduler-rpc diff --git a/escheduler-api/src/main/assembly/package.xml b/dolphinscheduler-api/src/main/assembly/package.xml similarity index 80% rename from escheduler-api/src/main/assembly/package.xml rename to dolphinscheduler-api/src/main/assembly/package.xml index 0d3c6ea573..1c24d64b03 100644 --- a/escheduler-api/src/main/assembly/package.xml +++ b/dolphinscheduler-api/src/main/assembly/package.xml @@ -18,7 +18,7 @@ conf - ${project.parent.basedir}/escheduler-common/src/main/resources + ${project.parent.basedir}/dolphinscheduler-common/src/main/resources **/*.properties **/*.xml @@ -27,7 +27,7 @@ conf - ${project.parent.basedir}/escheduler-common/src/main/resources/bin + ${project.parent.basedir}/dolphinscheduler-common/src/main/resources/bin *.* @@ -35,7 +35,7 @@ bin - ${project.parent.basedir}/escheduler-dao/src/main/resources + ${project.parent.basedir}/dolphinscheduler-dao/src/main/resources **/*.properties **/*.xml @@ -44,7 +44,7 @@ conf - ${project.parent.basedir}/escheduler-api/src/main/resources + ${project.parent.basedir}/dolphinscheduler-api/src/main/resources **/*.properties **/*.xml @@ -55,7 +55,7 @@ target/ - escheduler-api-${project.version}.jar + dolphinscheduler-api-${project.version}.jar lib diff --git a/escheduler-api/src/main/java/cn/escheduler/api/ApiApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/ApiApplicationServer.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java index 9b84c7f2f7..d999f375a0 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/ApiApplicationServer.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api; +package org.apache.dolphinscheduler.api; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java similarity index 84% rename from escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java index fc421944e9..df8c855949 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/CombinedApplicationServer.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/CombinedApplicationServer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api; +package org.apache.dolphinscheduler.api; -import cn.escheduler.alert.AlertServer; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.server.master.MasterServer; -import cn.escheduler.server.rpc.LoggerServer; -import cn.escheduler.server.worker.WorkerServer; +import org.apache.dolphinscheduler.alert.AlertServer; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.server.master.MasterServer; +import org.apache.dolphinscheduler.server.rpc.LoggerServer; +import org.apache.dolphinscheduler.server.worker.WorkerServer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java index de0331cc00..8ae2dbc529 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/configuration/AppConfiguration.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AppConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.configuration; +package org.apache.dolphinscheduler.api.configuration; -import cn.escheduler.api.interceptor.LoginHandlerInterceptor; +import org.apache.dolphinscheduler.api.interceptor.LoginHandlerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java similarity index 99% rename from escheduler-api/src/main/java/cn/escheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java index e9c001cc95..9821779ee4 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.configuration; +package org.apache.dolphinscheduler.api.configuration; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/configuration/SwaggerConfig.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/configuration/SwaggerConfig.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java index fb332c5ac9..5015438c19 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/configuration/SwaggerConfig.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/SwaggerConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.configuration; +package org.apache.dolphinscheduler.api.configuration; import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI; import org.springframework.context.annotation.Bean; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java similarity index 94% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java index 2e1876eb20..efc6eb6647 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/AccessTokenController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.AccessTokenService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.AccessTokenService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,9 +36,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - - +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * access token controller */ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java similarity index 85% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java index fd9f1c47f1..d12415cdd6 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/AlertGroupController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java @@ -14,18 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.AlertGroupService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.AlertGroupService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dolphinscheduler.api.enums.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,8 +37,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.HashMap; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * alert group controller */ @@ -78,8 +77,8 @@ public class AlertGroupController extends BaseController{ Map result = alertGroupService.createAlertgroup(loginUser, groupName, groupType,desc); return returnDataList(result); }catch (Exception e){ - logger.error(CREATE_ALERT_GROUP_ERROR.getMsg(),e); - return error(CREATE_ALERT_GROUP_ERROR.getCode(),CREATE_ALERT_GROUP_ERROR.getMsg()); + logger.error(Status.CREATE_ALERT_GROUP_ERROR.getMsg(),e); + return error(Status.CREATE_ALERT_GROUP_ERROR.getCode(), Status.CREATE_ALERT_GROUP_ERROR.getMsg()); } } @@ -98,8 +97,8 @@ public class AlertGroupController extends BaseController{ HashMap result = alertGroupService.queryAlertgroup(); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_ALL_ALERTGROUP_ERROR.getMsg(),e); - return error(QUERY_ALL_ALERTGROUP_ERROR.getCode(),QUERY_ALL_ALERTGROUP_ERROR.getMsg()); + logger.error(Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg(),e); + return error(Status.QUERY_ALL_ALERTGROUP_ERROR.getCode(), Status.QUERY_ALL_ALERTGROUP_ERROR.getMsg()); } } @@ -128,7 +127,7 @@ public class AlertGroupController extends BaseController{ loginUser.getUserName(),pageNo,searchVal,pageSize); try{ Map result = checkPageParams(pageNo, pageSize); - if(result.get(Constants.STATUS) != SUCCESS){ + if(result.get(Constants.STATUS) != Status.SUCCESS){ return returnDataListPaging(result); } @@ -136,8 +135,8 @@ public class AlertGroupController extends BaseController{ result = alertGroupService.listPaging(loginUser, searchVal, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(LIST_PAGING_ALERT_GROUP_ERROR.getMsg(),e); - return error(LIST_PAGING_ALERT_GROUP_ERROR.getCode(),LIST_PAGING_ALERT_GROUP_ERROR.getMsg()); + logger.error(Status.LIST_PAGING_ALERT_GROUP_ERROR.getMsg(),e); + return error(Status.LIST_PAGING_ALERT_GROUP_ERROR.getCode(), Status.LIST_PAGING_ALERT_GROUP_ERROR.getMsg()); } } @@ -171,8 +170,8 @@ public class AlertGroupController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(UPDATE_ALERT_GROUP_ERROR.getMsg(),e); - return error(UPDATE_ALERT_GROUP_ERROR.getCode(),UPDATE_ALERT_GROUP_ERROR.getMsg()); + logger.error(Status.UPDATE_ALERT_GROUP_ERROR.getMsg(),e); + return error(Status.UPDATE_ALERT_GROUP_ERROR.getCode(), Status.UPDATE_ALERT_GROUP_ERROR.getMsg()); } } @@ -196,8 +195,8 @@ public class AlertGroupController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(DELETE_ALERT_GROUP_ERROR.getMsg(),e); - return error(DELETE_ALERT_GROUP_ERROR.getCode(),DELETE_ALERT_GROUP_ERROR.getMsg()); + logger.error(Status.DELETE_ALERT_GROUP_ERROR.getMsg(),e); + return error(Status.DELETE_ALERT_GROUP_ERROR.getCode(), Status.DELETE_ALERT_GROUP_ERROR.getMsg()); } } @@ -246,8 +245,8 @@ public class AlertGroupController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(ALERT_GROUP_GRANT_USER_ERROR.getMsg(),e); - return error(ALERT_GROUP_GRANT_USER_ERROR.getCode(),ALERT_GROUP_GRANT_USER_ERROR.getMsg()); + logger.error(Status.ALERT_GROUP_GRANT_USER_ERROR.getMsg(),e); + return error(Status.ALERT_GROUP_GRANT_USER_ERROR.getCode(), Status.ALERT_GROUP_GRANT_USER_ERROR.getMsg()); } } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/BaseController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/BaseController.java similarity index 95% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/BaseController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/BaseController.java index 64e3b756b5..75bea3e4b6 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/BaseController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/BaseController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.Resource; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.Resource; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; @@ -28,7 +28,7 @@ import java.text.MessageFormat; import java.util.HashMap; import java.util.Map; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * base controller diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/DataAnalysisController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java similarity index 86% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/DataAnalysisController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java index 78dcf3afcb..76b4f244b7 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/DataAnalysisController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.DataAnalysisService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.DataAnalysisService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dolphinscheduler.api.enums.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +35,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * data analysis controller */ @@ -76,8 +75,8 @@ public class DataAnalysisController extends BaseController{ Map result = dataAnalysisService.countTaskStateByProject(loginUser,projectId, startDate, endDate); return returnDataList(result); }catch (Exception e){ - logger.error(TASK_INSTANCE_STATE_COUNT_ERROR.getMsg(),e); - return error(TASK_INSTANCE_STATE_COUNT_ERROR.getCode(), TASK_INSTANCE_STATE_COUNT_ERROR.getMsg()); + logger.error(Status.TASK_INSTANCE_STATE_COUNT_ERROR.getMsg(),e); + return error(Status.TASK_INSTANCE_STATE_COUNT_ERROR.getCode(), Status.TASK_INSTANCE_STATE_COUNT_ERROR.getMsg()); } } @@ -106,8 +105,8 @@ public class DataAnalysisController extends BaseController{ Map result = dataAnalysisService.countProcessInstanceStateByProject(loginUser, projectId, startDate, endDate); return returnDataList(result); }catch (Exception e){ - logger.error(COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg(),e); - return error(COUNT_PROCESS_INSTANCE_STATE_ERROR.getCode(), COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg()); + logger.error(Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg(),e); + return error(Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getCode(), Status.COUNT_PROCESS_INSTANCE_STATE_ERROR.getMsg()); } } @@ -132,8 +131,8 @@ public class DataAnalysisController extends BaseController{ Map result = dataAnalysisService.countDefinitionByUser(loginUser, projectId); return returnDataList(result); }catch (Exception e){ - logger.error(COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg(),e); - return error(COUNT_PROCESS_DEFINITION_USER_ERROR.getCode(), COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg()); + logger.error(Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg(),e); + return error(Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getCode(), Status.COUNT_PROCESS_DEFINITION_USER_ERROR.getMsg()); } } @@ -163,8 +162,8 @@ public class DataAnalysisController extends BaseController{ Map result = dataAnalysisService.countCommandState(loginUser, projectId, startDate, endDate); return returnDataList(result); }catch (Exception e){ - logger.error(COMMAND_STATE_COUNT_ERROR.getMsg(),e); - return error(COMMAND_STATE_COUNT_ERROR.getCode(), COMMAND_STATE_COUNT_ERROR.getMsg()); + logger.error(Status.COMMAND_STATE_COUNT_ERROR.getMsg(),e); + return error(Status.COMMAND_STATE_COUNT_ERROR.getCode(), Status.COMMAND_STATE_COUNT_ERROR.getMsg()); } } @@ -191,8 +190,8 @@ public class DataAnalysisController extends BaseController{ Map result = dataAnalysisService.countQueueState(loginUser, projectId); return returnDataList(result); }catch (Exception e){ - logger.error(QUEUE_COUNT_ERROR.getMsg(),e); - return error(QUEUE_COUNT_ERROR.getCode(), QUEUE_COUNT_ERROR.getMsg()); + logger.error(Status.QUEUE_COUNT_ERROR.getMsg(),e); + return error(Status.QUEUE_COUNT_ERROR.getCode(), Status.QUEUE_COUNT_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java index 57cb214d76..1f9a30098f 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/DataSourceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.DataSourceService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.utils.CommonUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.DataSourceService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -37,9 +37,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - - +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * data source controller */ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java similarity index 89% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java index 098c5e8e43..68b6985ffe 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ExecutorController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.ExecuteType; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.ExecutorService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.*; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.ExecuteType; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.ExecutorService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; +import org.apache.dolphinscheduler.common.enums.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,8 +34,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * execute process controller @@ -97,7 +95,7 @@ public class ExecutorController extends BaseController { workerGroupId, timeout); if (timeout == null) { - timeout = cn.escheduler.common.Constants.MAX_TASK_TIMEOUT; + timeout = org.apache.dolphinscheduler.common.Constants.MAX_TASK_TIMEOUT; } Map result = execService.execProcessInstance(loginUser, projectName, processDefinitionId, scheduleTime, execType, failureStrategy, @@ -105,7 +103,7 @@ public class ExecutorController extends BaseController { warningGroupId,receivers,receiversCc, runMode,processInstancePriority, workerGroupId, timeout); return returnDataList(result); } catch (Exception e) { - logger.error(START_PROCESS_INSTANCE_ERROR.getMsg(),e); + logger.error(Status.START_PROCESS_INSTANCE_ERROR.getMsg(),e); return error(Status.START_PROCESS_INSTANCE_ERROR.getCode(), Status.START_PROCESS_INSTANCE_ERROR.getMsg()); } } @@ -137,8 +135,8 @@ public class ExecutorController extends BaseController { Map result = execService.execute(loginUser, projectName, processInstanceId, executeType); return returnDataList(result); } catch (Exception e) { - logger.error(EXECUTE_PROCESS_INSTANCE_ERROR.getMsg(),e); - return error(EXECUTE_PROCESS_INSTANCE_ERROR.getCode(), EXECUTE_PROCESS_INSTANCE_ERROR.getMsg()); + logger.error(Status.EXECUTE_PROCESS_INSTANCE_ERROR.getMsg(),e); + return error(Status.EXECUTE_PROCESS_INSTANCE_ERROR.getCode(), Status.EXECUTE_PROCESS_INSTANCE_ERROR.getMsg()); } } @@ -163,8 +161,8 @@ public class ExecutorController extends BaseController { return returnDataList(result); } catch (Exception e) { - logger.error(CHECK_PROCESS_DEFINITION_ERROR.getMsg(),e); - return error(CHECK_PROCESS_DEFINITION_ERROR.getCode(), CHECK_PROCESS_DEFINITION_ERROR.getMsg()); + logger.error(Status.CHECK_PROCESS_DEFINITION_ERROR.getMsg(),e); + return error(Status.CHECK_PROCESS_DEFINITION_ERROR.getCode(), Status.CHECK_PROCESS_DEFINITION_ERROR.getMsg()); } } @@ -192,8 +190,8 @@ public class ExecutorController extends BaseController { Map result = execService.getReceiverCc(processDefinitionId,processInstanceId); return returnDataList(result); } catch (Exception e) { - logger.error(QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg(),e); - return error(QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getCode(), QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg()); + logger.error(Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg(),e); + return error(Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getCode(), Status.QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/LoggerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java similarity index 85% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/LoggerController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java index 0393462999..e04101ad7f 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/LoggerController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java @@ -14,17 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.LoggerService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.LoggerService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dolphinscheduler.api.enums.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +35,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; -import static cn.escheduler.api.enums.Status.DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR; -import static cn.escheduler.api.enums.Status.QUERY_TASK_INSTANCE_LOG_ERROR; - /** * log controller @@ -73,8 +71,8 @@ public class LoggerController extends BaseController { "login user {}, view {} task instance log ,skipLineNum {} , limit {}", loginUser.getUserName(), taskInstanceId, skipNum, limit); return loggerService.queryLog(taskInstanceId, skipNum, limit); } catch (Exception e) { - logger.error(QUERY_TASK_INSTANCE_LOG_ERROR.getMsg(), e); - return error(QUERY_TASK_INSTANCE_LOG_ERROR.getCode(), QUERY_TASK_INSTANCE_LOG_ERROR.getMsg()); + logger.error(Status.QUERY_TASK_INSTANCE_LOG_ERROR.getMsg(), e); + return error(Status.QUERY_TASK_INSTANCE_LOG_ERROR.getCode(), Status.QUERY_TASK_INSTANCE_LOG_ERROR.getMsg()); } } @@ -100,8 +98,8 @@ public class LoggerController extends BaseController { .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + System.currentTimeMillis() + ".queryLog" + "\"") .body(logBytes); } catch (Exception e) { - logger.error(DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg(), e); - return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg()); + logger.error(Status.DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg(), e); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Status.DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/LoginController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java similarity index 91% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/LoginController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java index 250862d491..81911c62a1 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/LoginController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoginController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.SessionService; -import cn.escheduler.api.service.UsersService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.SessionService; +import org.apache.dolphinscheduler.api.service.UsersService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.lang3.StringUtils; @@ -36,7 +36,7 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static cn.escheduler.api.enums.Status.*; +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * user login controller diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/MonitorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/MonitorController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java index a9ae6d4c2c..396675b97d 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/MonitorController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.MonitorService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.MonitorService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -32,9 +32,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - - +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * monitor controller */ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java similarity index 88% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java index 55a29c31ed..5f3ab86d02 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessDefinitionController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.ProcessDefinitionService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.ProcessDefinitionService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +33,6 @@ import springfox.documentation.annotations.ApiIgnore; import javax.servlet.http.HttpServletResponse; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; -import static cn.escheduler.api.enums.Status.EXPORT_PROCESS_DEFINE_BY_ID_ERROR; - /** * process definition controller @@ -86,8 +83,8 @@ public class ProcessDefinitionController extends BaseController{ desc, locations, connects); return returnDataList(result); } catch (Exception e) { - logger.error(CREATE_PROCESS_DEFINITION.getMsg(), e); - return error(CREATE_PROCESS_DEFINITION.getCode(), CREATE_PROCESS_DEFINITION.getMsg()); + logger.error(Status.CREATE_PROCESS_DEFINITION.getMsg(), e); + return error(Status.CREATE_PROCESS_DEFINITION.getCode(), Status.CREATE_PROCESS_DEFINITION.getMsg()); } } @@ -114,8 +111,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.verifyProccessDefinitionName(loginUser, projectName, name); return returnDataList(result); }catch (Exception e){ - logger.error(VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg(),e); - return error(VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getCode(), Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg()); + logger.error(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg(),e); + return error(Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getCode(), Status.VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR.getMsg()); } } @@ -158,8 +155,8 @@ public class ProcessDefinitionController extends BaseController{ processDefinitionJson, desc, locations, connects); return returnDataList(result); }catch (Exception e){ - logger.error(UPDATE_PROCESS_DEFINITION_ERROR.getMsg(),e); - return error(UPDATE_PROCESS_DEFINITION_ERROR.getCode(), Status.UPDATE_PROCESS_DEFINITION_ERROR.getMsg()); + logger.error(Status.UPDATE_PROCESS_DEFINITION_ERROR.getMsg(),e); + return error(Status.UPDATE_PROCESS_DEFINITION_ERROR.getCode(), Status.UPDATE_PROCESS_DEFINITION_ERROR.getMsg()); } } @@ -191,8 +188,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.releaseProcessDefinition(loginUser, projectName, processId, releaseState); return returnDataList(result); }catch (Exception e){ - logger.error(RELEASE_PROCESS_DEFINITION_ERROR.getMsg(),e); - return error(RELEASE_PROCESS_DEFINITION_ERROR.getCode(), Status.RELEASE_PROCESS_DEFINITION_ERROR.getMsg()); + logger.error(Status.RELEASE_PROCESS_DEFINITION_ERROR.getMsg(),e); + return error(Status.RELEASE_PROCESS_DEFINITION_ERROR.getCode(), Status.RELEASE_PROCESS_DEFINITION_ERROR.getMsg()); } } @@ -221,8 +218,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.queryProccessDefinitionById(loginUser, projectName, processId); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg(),e); - return error(QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getCode(), Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg()); + logger.error(Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg(),e); + return error(Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getCode(), Status.QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR.getMsg()); } } @@ -246,8 +243,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.queryProccessDefinitionList(loginUser, projectName); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e); - return error(QUERY_PROCCESS_DEFINITION_LIST.getCode(), QUERY_PROCCESS_DEFINITION_LIST.getMsg()); + logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e); + return error(Status.QUERY_PROCCESS_DEFINITION_LIST.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg()); } } @@ -284,8 +281,8 @@ public class ProcessDefinitionController extends BaseController{ result = processDefinitionService.queryProcessDefinitionListPaging(loginUser, projectName, searchVal, pageNo, pageSize, userId); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg(),e); - return error(QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getCode(), QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg()); + logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg(),e); + return error(Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR.getMsg()); } } @@ -313,8 +310,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.viewTree(id, limit); return returnDataList(result); }catch (Exception e){ - logger.error(ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg(),e); - return error(ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getCode(),ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg()); + logger.error(Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg(),e); + return error(Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getCode(), Status.ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR.getMsg()); } } @@ -345,8 +342,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.getTaskNodeListByDefinitionId(processDefinitionId); return returnDataList(result); }catch (Exception e){ - logger.error(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e); - return error(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg()); + logger.error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e); + return error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg()); } } @@ -377,8 +374,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.getTaskNodeListByDefinitionIdList(processDefinitionIdList); return returnDataList(result); }catch (Exception e){ - logger.error(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e); - return error(GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg()); + logger.error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg(), e); + return error(Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getCode(), Status.GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR.getMsg()); } } @@ -406,7 +403,7 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.deleteProcessDefinitionById(loginUser, projectName, processDefinitionId); return returnDataList(result); }catch (Exception e){ - logger.error(DELETE_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e); + logger.error(Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e); return error(Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getCode(), Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR.getMsg()); } } @@ -435,7 +432,7 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.batchDeleteProcessDefinitionByIds(loginUser, projectName, processDefinitionIds); return returnDataList(result); }catch (Exception e){ - logger.error(BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getMsg(),e); + logger.error(Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getMsg(),e); return error(Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getCode(), Status.BATCH_DELETE_PROCESS_DEFINE_BY_IDS_ERROR.getMsg()); } } @@ -463,7 +460,7 @@ public class ProcessDefinitionController extends BaseController{ loginUser.getUserName(), projectName, processDefinitionId); processDefinitionService.exportProcessDefinitionById(loginUser, projectName, processDefinitionId,response); }catch (Exception e){ - logger.error(EXPORT_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e); + logger.error(Status.EXPORT_PROCESS_DEFINE_BY_ID_ERROR.getMsg(),e); } } @@ -486,8 +483,8 @@ public class ProcessDefinitionController extends BaseController{ Map result = processDefinitionService.queryProccessDefinitionAllByProjectId(projectId); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e); - return error(QUERY_PROCCESS_DEFINITION_LIST.getCode(), QUERY_PROCCESS_DEFINITION_LIST.getMsg()); + logger.error(Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg(),e); + return error(Status.QUERY_PROCCESS_DEFINITION_LIST.getCode(), Status.QUERY_PROCCESS_DEFINITION_LIST.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java index 83170d655c..04233985d8 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProcessInstanceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.ProcessInstanceService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.Flag; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.ProcessInstanceService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * process instance controller diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java similarity index 95% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java index 383dc687d8..d9927bbc2b 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ProjectController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.ProcessDefinitionService; -import cn.escheduler.api.service.ProjectService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.ProcessDefinitionService; +import org.apache.dolphinscheduler.api.service.ProjectService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -38,7 +38,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * project controller diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java similarity index 86% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java index 8023cd8030..c06c80808f 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/QueueController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.QueueService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.QueueService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,8 +36,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * queue controller @@ -67,8 +65,8 @@ public class QueueController extends BaseController{ Map result = queueService.queryList(loginUser); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_QUEUE_LIST_ERROR.getMsg(),e); - return error(QUERY_QUEUE_LIST_ERROR.getCode(), QUERY_QUEUE_LIST_ERROR.getMsg()); + logger.error(Status.QUERY_QUEUE_LIST_ERROR.getMsg(),e); + return error(Status.QUERY_QUEUE_LIST_ERROR.getCode(), Status.QUERY_QUEUE_LIST_ERROR.getMsg()); } } @@ -100,8 +98,8 @@ public class QueueController extends BaseController{ result = queueService.queryList(loginUser,searchVal,pageNo,pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_QUEUE_LIST_ERROR.getMsg(),e); - return error(QUERY_QUEUE_LIST_ERROR.getCode(), QUERY_QUEUE_LIST_ERROR.getMsg()); + logger.error(Status.QUERY_QUEUE_LIST_ERROR.getMsg(),e); + return error(Status.QUERY_QUEUE_LIST_ERROR.getCode(), Status.QUERY_QUEUE_LIST_ERROR.getMsg()); } } @@ -130,8 +128,8 @@ public class QueueController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(CREATE_QUEUE_ERROR.getMsg(),e); - return error(CREATE_QUEUE_ERROR.getCode(), CREATE_QUEUE_ERROR.getMsg()); + logger.error(Status.CREATE_QUEUE_ERROR.getMsg(),e); + return error(Status.CREATE_QUEUE_ERROR.getCode(), Status.CREATE_QUEUE_ERROR.getMsg()); } } @@ -162,8 +160,8 @@ public class QueueController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(UPDATE_QUEUE_ERROR.getMsg(),e); - return error(UPDATE_QUEUE_ERROR.getCode(), UPDATE_QUEUE_ERROR.getMsg()); + logger.error(Status.UPDATE_QUEUE_ERROR.getMsg(),e); + return error(Status.UPDATE_QUEUE_ERROR.getCode(), Status.UPDATE_QUEUE_ERROR.getMsg()); } } @@ -193,7 +191,7 @@ public class QueueController extends BaseController{ loginUser.getUserName(),queue,queueName); return queueService.verifyQueue(queue,queueName); }catch (Exception e){ - logger.error(VERIFY_QUEUE_ERROR.getMsg(),e); + logger.error(Status.VERIFY_QUEUE_ERROR.getMsg(),e); return error(Status.VERIFY_QUEUE_ERROR.getCode(), Status.VERIFY_QUEUE_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java index 578bd55277..0070b50952 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/ResourcesController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.ResourcesService; -import cn.escheduler.api.service.UdfFuncService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ResourceType; -import cn.escheduler.common.enums.UdfType; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.ResourcesService; +import org.apache.dolphinscheduler.api.service.UdfFuncService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.enums.UdfType; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -43,8 +43,7 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * resources controller */ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java similarity index 95% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java index de3aea29dd..1d436d7d3d 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.SchedulerService; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.FailureStrategy; -import cn.escheduler.common.enums.Priority; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.common.enums.WarningType; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.SchedulerService; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.FailureStrategy; +import org.apache.dolphinscheduler.common.enums.Priority; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,8 +36,8 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; -import static cn.escheduler.api.utils.Constants.SESSION_USER; +import static org.apache.dolphinscheduler.api.utils.Constants.SESSION_USER; +import static org.apache.dolphinscheduler.api.enums.Status.*; /** * schedule controller diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java similarity index 87% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java index 22a171fa2e..99213358cd 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/TaskInstanceController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java @@ -14,16 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.TaskInstanceService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.TaskInstanceService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.*; +import org.apache.dolphinscheduler.api.enums.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -33,8 +34,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.QUERY_TASK_LIST_PAGING_ERROR; - /** * task instance controller */ @@ -89,8 +88,8 @@ public class TaskInstanceController extends BaseController{ loginUser, projectName, processInstanceId, taskName, startTime, endTime, searchVal, stateType, host, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_TASK_LIST_PAGING_ERROR.getMsg(),e); - return error(QUERY_TASK_LIST_PAGING_ERROR.getCode(), QUERY_TASK_LIST_PAGING_ERROR.getMsg()); + logger.error(Status.QUERY_TASK_LIST_PAGING_ERROR.getMsg(),e); + return error(Status.QUERY_TASK_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_LIST_PAGING_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/TaskRecordController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskRecordController.java similarity index 86% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/TaskRecordController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskRecordController.java index 681d19316a..dabcf62b80 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/TaskRecordController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskRecordController.java @@ -14,13 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.service.TaskRecordService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.service.TaskRecordService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,8 +31,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR; - /** * data quality controller */ @@ -73,8 +72,8 @@ public class TaskRecordController extends BaseController{ Map result = taskRecordService.queryTaskRecordListPaging(false, taskName, startTime, taskDate, sourceTable, destTable, endTime,state, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e); - return error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg()); + logger.error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e); + return error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg()); } } @@ -105,8 +104,8 @@ public class TaskRecordController extends BaseController{ Map result = taskRecordService.queryTaskRecordListPaging(true, taskName, startTime, taskDate, sourceTable, destTable, endTime,state, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e); - return error(QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg()); + logger.error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg(),e); + return error(Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getCode(), Status.QUERY_TASK_RECORD_LIST_PAGING_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java similarity index 90% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java index afd469d45e..2ec74398c2 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.TenantService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.TenantService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,8 +36,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * tenant controller @@ -85,8 +83,8 @@ public class TenantController extends BaseController{ return returnDataList(result); }catch (Exception e){ - logger.error(CREATE_TENANT_ERROR.getMsg(),e); - return error(CREATE_TENANT_ERROR.getCode(), CREATE_TENANT_ERROR.getMsg()); + logger.error(Status.CREATE_TENANT_ERROR.getMsg(),e); + return error(Status.CREATE_TENANT_ERROR.getCode(), Status.CREATE_TENANT_ERROR.getMsg()); } } @@ -123,7 +121,7 @@ public class TenantController extends BaseController{ result = tenantService.queryTenantList(loginUser, searchVal, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_TENANT_LIST_PAGING_ERROR.getMsg(),e); + logger.error(Status.QUERY_TENANT_LIST_PAGING_ERROR.getMsg(),e); return error(Status.QUERY_TENANT_LIST_PAGING_ERROR.getCode(), Status.QUERY_TENANT_LIST_PAGING_ERROR.getMsg()); } } @@ -144,7 +142,7 @@ public class TenantController extends BaseController{ Map result = tenantService.queryTenantList(loginUser); return returnDataList(result); }catch (Exception e){ - logger.error(QUERY_TENANT_LIST_ERROR.getMsg(),e); + logger.error(Status.QUERY_TENANT_LIST_ERROR.getMsg(),e); return error(Status.QUERY_TENANT_LIST_ERROR.getCode(), Status.QUERY_TENANT_LIST_ERROR.getMsg()); } } @@ -184,8 +182,8 @@ public class TenantController extends BaseController{ Map result = tenantService.updateTenant(loginUser,id,tenantCode, tenantName, queueId, desc); return returnDataList(result); }catch (Exception e){ - logger.error(UPDATE_TENANT_ERROR.getMsg(),e); - return error(Status.UPDATE_TENANT_ERROR.getCode(),UPDATE_TENANT_ERROR.getMsg()); + logger.error(Status.UPDATE_TENANT_ERROR.getMsg(),e); + return error(Status.UPDATE_TENANT_ERROR.getCode(), Status.UPDATE_TENANT_ERROR.getMsg()); } } @@ -210,7 +208,7 @@ public class TenantController extends BaseController{ Map result = tenantService.deleteTenantById(loginUser,id); return returnDataList(result); }catch (Exception e){ - logger.error(DELETE_TENANT_BY_ID_ERROR.getMsg(),e); + logger.error(Status.DELETE_TENANT_BY_ID_ERROR.getMsg(),e); return error(Status.DELETE_TENANT_BY_ID_ERROR.getCode(), Status.DELETE_TENANT_BY_ID_ERROR.getMsg()); } } @@ -238,7 +236,7 @@ public class TenantController extends BaseController{ loginUser.getUserName(),tenantCode); return tenantService.verifyTenantCode(tenantCode); }catch (Exception e){ - logger.error(VERIFY_TENANT_CODE_ERROR.getMsg(),e); + logger.error(Status.VERIFY_TENANT_CODE_ERROR.getMsg(),e); return error(Status.VERIFY_TENANT_CODE_ERROR.getCode(), Status.VERIFY_TENANT_CODE_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java index 4b9bd08c74..f8aab7c97c 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/UsersController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.UsersService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.UsersService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -36,8 +36,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.enums.Status.*; - /** * user controller @@ -88,8 +86,8 @@ public class UsersController extends BaseController{ Map result = usersService.createUser(loginUser, userName, userPassword,email,tenantId, phone,queue); return returnDataList(result); }catch (Exception e){ - logger.error(CREATE_USER_ERROR.getMsg(),e); - return error(CREATE_USER_ERROR.getCode(), CREATE_USER_ERROR.getMsg()); + logger.error(Status.CREATE_USER_ERROR.getMsg(),e); + return error(Status.CREATE_USER_ERROR.getCode(), Status.CREATE_USER_ERROR.getMsg()); } } @@ -125,7 +123,7 @@ public class UsersController extends BaseController{ result = usersService.queryUserList(loginUser, searchVal, pageNo, pageSize); return returnDataListPaging(result); }catch (Exception e){ - logger.error(QUERY_USER_LIST_PAGING_ERROR.getMsg(),e); + logger.error(Status.QUERY_USER_LIST_PAGING_ERROR.getMsg(),e); return error(Status.QUERY_USER_LIST_PAGING_ERROR.getCode(), Status.QUERY_USER_LIST_PAGING_ERROR.getMsg()); } } @@ -169,7 +167,7 @@ public class UsersController extends BaseController{ Map result = usersService.updateUser(id, userName, userPassword, email, tenantId, phone, queue); return returnDataList(result); }catch (Exception e){ - logger.error(UPDATE_USER_ERROR.getMsg(),e); + logger.error(Status.UPDATE_USER_ERROR.getMsg(),e); return error(Status.UPDATE_USER_ERROR.getCode(), Status.UPDATE_USER_ERROR.getMsg()); } } @@ -193,7 +191,7 @@ public class UsersController extends BaseController{ Map result = usersService.deleteUserById(loginUser, id); return returnDataList(result); }catch (Exception e){ - logger.error(DELETE_USER_BY_ID_ERROR.getMsg(),e); + logger.error(Status.DELETE_USER_BY_ID_ERROR.getMsg(),e); return error(Status.DELETE_USER_BY_ID_ERROR.getCode(), Status.DELETE_USER_BY_ID_ERROR.getMsg()); } } @@ -220,7 +218,7 @@ public class UsersController extends BaseController{ Map result = usersService.grantProject(loginUser, userId, projectIds); return returnDataList(result); }catch (Exception e){ - logger.error(GRANT_PROJECT_ERROR.getMsg(),e); + logger.error(Status.GRANT_PROJECT_ERROR.getMsg(),e); return error(Status.GRANT_PROJECT_ERROR.getCode(), Status.GRANT_PROJECT_ERROR.getMsg()); } } @@ -247,7 +245,7 @@ public class UsersController extends BaseController{ Map result = usersService.grantResources(loginUser, userId, resourceIds); return returnDataList(result); }catch (Exception e){ - logger.error(GRANT_RESOURCE_ERROR.getMsg(),e); + logger.error(Status.GRANT_RESOURCE_ERROR.getMsg(),e); return error(Status.GRANT_RESOURCE_ERROR.getCode(), Status.GRANT_RESOURCE_ERROR.getMsg()); } } @@ -275,7 +273,7 @@ public class UsersController extends BaseController{ Map result = usersService.grantUDFFunction(loginUser, userId, udfIds); return returnDataList(result); }catch (Exception e){ - logger.error(GRANT_UDF_FUNCTION_ERROR.getMsg(),e); + logger.error(Status.GRANT_UDF_FUNCTION_ERROR.getMsg(),e); return error(Status.GRANT_UDF_FUNCTION_ERROR.getCode(), Status.GRANT_UDF_FUNCTION_ERROR.getMsg()); } } @@ -304,7 +302,7 @@ public class UsersController extends BaseController{ Map result = usersService.grantDataSource(loginUser, userId, datasourceIds); return returnDataList(result); }catch (Exception e){ - logger.error(GRANT_DATASOURCE_ERROR.getMsg(),e); + logger.error(Status.GRANT_DATASOURCE_ERROR.getMsg(),e); return error(Status.GRANT_DATASOURCE_ERROR.getCode(), Status.GRANT_DATASOURCE_ERROR.getMsg()); } } @@ -325,7 +323,7 @@ public class UsersController extends BaseController{ Map result = usersService.getUserInfo(loginUser); return returnDataList(result); }catch (Exception e){ - logger.error(GET_USER_INFO_ERROR.getMsg(),e); + logger.error(Status.GET_USER_INFO_ERROR.getMsg(),e); return error(Status.GET_USER_INFO_ERROR.getCode(), Status.GET_USER_INFO_ERROR.getMsg()); } } @@ -345,7 +343,7 @@ public class UsersController extends BaseController{ Map result = usersService.queryAllGeneralUsers(loginUser); return returnDataList(result); }catch (Exception e){ - logger.error(USER_LIST_ERROR.getMsg(),e); + logger.error(Status.USER_LIST_ERROR.getMsg(),e); return error(Status.USER_LIST_ERROR.getCode(), Status.USER_LIST_ERROR.getMsg()); } } @@ -365,7 +363,7 @@ public class UsersController extends BaseController{ Map result = usersService.queryUserList(loginUser); return returnDataList(result); }catch (Exception e){ - logger.error(USER_LIST_ERROR.getMsg(),e); + logger.error(Status.USER_LIST_ERROR.getMsg(),e); return error(Status.USER_LIST_ERROR.getCode(), Status.USER_LIST_ERROR.getMsg()); } } @@ -393,7 +391,7 @@ public class UsersController extends BaseController{ loginUser.getUserName(),userName); return usersService.verifyUserName(userName); }catch (Exception e){ - logger.error(VERIFY_USERNAME_ERROR.getMsg(),e); + logger.error(Status.VERIFY_USERNAME_ERROR.getMsg(),e); return error(Status.VERIFY_USERNAME_ERROR.getCode(), Status.VERIFY_USERNAME_ERROR.getMsg()); } } @@ -420,7 +418,7 @@ public class UsersController extends BaseController{ Map result = usersService.unauthorizedUser(loginUser, alertgroupId); return returnDataList(result); }catch (Exception e){ - logger.error(UNAUTHORIZED_USER_ERROR.getMsg(),e); + logger.error(Status.UNAUTHORIZED_USER_ERROR.getMsg(),e); return error(Status.UNAUTHORIZED_USER_ERROR.getCode(), Status.UNAUTHORIZED_USER_ERROR.getMsg()); } } @@ -447,7 +445,7 @@ public class UsersController extends BaseController{ Map result = usersService.authorizedUser(loginUser, alertgroupId); return returnDataList(result); }catch (Exception e){ - logger.error(AUTHORIZED_USER_ERROR.getMsg(),e); + logger.error(Status.AUTHORIZED_USER_ERROR.getMsg(),e); return error(Status.AUTHORIZED_USER_ERROR.getCode(), Status.AUTHORIZED_USER_ERROR.getMsg()); } } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java similarity index 91% rename from escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java index 564da50be3..d0c934ea6d 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/controller/WorkerGroupController.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java @@ -14,18 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.service.WorkerGroupService; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.service.WorkerGroupService; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.User; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.dolphinscheduler.api.utils.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -35,8 +36,6 @@ import springfox.documentation.annotations.ApiIgnore; import java.util.Map; -import static cn.escheduler.api.utils.Constants.SESSION_USER; - /** * worker group controller */ @@ -68,7 +67,7 @@ public class WorkerGroupController extends BaseController{ }) @PostMapping(value = "/save") @ResponseStatus(HttpStatus.OK) - public Result saveWorkerGroup(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser, + public Result saveWorkerGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @RequestParam(value = "id", required = false, defaultValue = "0") int id, @RequestParam(value = "name") String name, @RequestParam(value = "ipList") String ipList @@ -101,7 +100,7 @@ public class WorkerGroupController extends BaseController{ }) @GetMapping(value = "/list-paging") @ResponseStatus(HttpStatus.OK) - public Result queryAllWorkerGroupsPaging(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser, + public Result queryAllWorkerGroupsPaging(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @RequestParam("pageNo") Integer pageNo, @RequestParam(value = "searchVal", required = false) String searchVal, @RequestParam("pageSize") Integer pageSize @@ -127,7 +126,7 @@ public class WorkerGroupController extends BaseController{ @ApiOperation(value = "queryAllWorkerGroups", notes= "QUERY_WORKER_GROUP_LIST_NOTES") @GetMapping(value = "/all-groups") @ResponseStatus(HttpStatus.OK) - public Result queryAllWorkerGroups(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser + public Result queryAllWorkerGroups(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser ) { logger.info("query all worker group: login user {}", loginUser.getUserName() ); @@ -154,7 +153,7 @@ public class WorkerGroupController extends BaseController{ }) @GetMapping(value = "/delete-by-id") @ResponseStatus(HttpStatus.OK) - public Result deleteById(@ApiIgnore @RequestAttribute(value = SESSION_USER) User loginUser, + public Result deleteById(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser, @RequestParam("id") Integer id ) { logger.info("delete worker group: login user {}, id:{} ", diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/CommandStateCount.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/CommandStateCount.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java index 00abfe1892..3c3c31bfce 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/CommandStateCount.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto; +package org.apache.dolphinscheduler.api.dto; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.CommandType; /** * command state count diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/DefineUserDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/DefineUserDto.java similarity index 92% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/DefineUserDto.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/DefineUserDto.java index 36b5d907ed..539dc71a5e 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/DefineUserDto.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/DefineUserDto.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto; +package org.apache.dolphinscheduler.api.dto; -import cn.escheduler.dao.entity.DefinitionGroupByUser; +import org.apache.dolphinscheduler.dao.entity.DefinitionGroupByUser; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/ScheduleParam.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ScheduleParam.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/ScheduleParam.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ScheduleParam.java index 5b08fbc08f..538786e63d 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/ScheduleParam.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/ScheduleParam.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto; +package org.apache.dolphinscheduler.api.dto; import java.util.Date; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/TaskCountDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/TaskCountDto.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java index 786560b7b4..b6b587bde6 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/TaskCountDto.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto; +package org.apache.dolphinscheduler.api.dto; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.dao.entity.ExecuteStatusCount; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; import java.util.ArrayList; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/TaskStateCount.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java similarity index 92% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/TaskStateCount.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java index 8d293207b4..a2fe348e40 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/TaskStateCount.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto; +package org.apache.dolphinscheduler.api.dto; -import cn.escheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; /** * task state count diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/GanttDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/GanttDto.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java index f9f900a827..d6fa662bcd 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/GanttDto.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto.gantt; +package org.apache.dolphinscheduler.api.dto.gantt; import java.util.ArrayList; import java.util.HashMap; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/Task.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/Task.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java index 69f46134f2..848abdf5d6 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/gantt/Task.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto.gantt; +package org.apache.dolphinscheduler.api.dto.gantt; import java.util.ArrayList; import java.util.Date; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/Instance.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/Instance.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/Instance.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/Instance.java index e569d3ba95..5997f04906 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/Instance.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/Instance.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto.treeview; +package org.apache.dolphinscheduler.api.dto.treeview; import java.util.Date; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/TreeViewDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/TreeViewDto.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/TreeViewDto.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/TreeViewDto.java index 35ca7f8aa0..35be4d5ec7 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/dto/treeview/TreeViewDto.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/TreeViewDto.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.dto.treeview; +package org.apache.dolphinscheduler.api.dto.treeview; import java.util.ArrayList; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/enums/ExecuteType.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/enums/ExecuteType.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java index b09f424b30..0af66ff5f0 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/enums/ExecuteType.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.enums; +package org.apache.dolphinscheduler.api.enums; /** * execute type diff --git a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java similarity index 99% rename from escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java index 802dddfb99..2c23d2103b 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/enums/Status.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.enums; +package org.apache.dolphinscheduler.api.enums; /** * status enum diff --git a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatFilter.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatFilter.java similarity index 95% rename from escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatFilter.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatFilter.java index ea7bff2199..feb725a97c 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatFilter.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.interceptor; +package org.apache.dolphinscheduler.api.interceptor; import com.alibaba.druid.support.http.WebStatFilter; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatViewServlet.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatViewServlet.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatViewServlet.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatViewServlet.java index 4abac92dfe..9017622cd3 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/DruidStatViewServlet.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/DruidStatViewServlet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.interceptor; +package org.apache.dolphinscheduler.api.interceptor; import com.alibaba.druid.support.http.StatViewServlet; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/LoginHandlerInterceptor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java similarity index 92% rename from escheduler-api/src/main/java/cn/escheduler/api/interceptor/LoginHandlerInterceptor.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java index 406bdeff84..5b7b64a0dd 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/interceptor/LoginHandlerInterceptor.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/LoginHandlerInterceptor.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.interceptor; +package org.apache.dolphinscheduler.api.interceptor; -import cn.escheduler.api.service.SessionService; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.dao.entity.Session; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.UserMapper; +import org.apache.dolphinscheduler.api.service.SessionService; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.dao.entity.Session; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.UserMapper; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/log/LogClient.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/log/LogClient.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/log/LogClient.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/log/LogClient.java index 1940cc0646..792bb8a0d4 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/log/LogClient.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/log/LogClient.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.log; +package org.apache.dolphinscheduler.api.log; -import cn.escheduler.rpc.*; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.StatusRuntimeException; +import org.apache.dolphinscheduler.rpc.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java similarity index 90% rename from escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java index 537ea66d98..0a916330e0 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/AccessTokenService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java @@ -14,18 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.utils.*; -import cn.escheduler.dao.entity.AccessToken; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.*; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.AccessToken; +import org.apache.dolphinscheduler.dao.entity.User; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.EncryptionUtils; +import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/AlertGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java similarity index 92% rename from escheduler-api/src/main/java/cn/escheduler/api/service/AlertGroupService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java index 2d3f3d85ce..7206b96055 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/AlertGroupService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.AlertGroup; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.entity.UserAlertGroup; -import cn.escheduler.dao.mapper.AlertGroupMapper; -import cn.escheduler.dao.mapper.UserAlertGroupMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.AlertGroup; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.entity.UserAlertGroup; +import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper; +import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/BaseDAGService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseDAGService.java similarity index 83% rename from escheduler-api/src/main/java/cn/escheduler/api/service/BaseDAGService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseDAGService.java index af757b9535..23b7c6a52a 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/BaseDAGService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseDAGService.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.ProcessDag; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.entity.ProcessData; -import cn.escheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.ProcessDag; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessData; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import java.util.ArrayList; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/BaseService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java similarity index 90% rename from escheduler-api/src/main/java/cn/escheduler/api/service/BaseService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java index dd63d4d7c4..08cdbf6245 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/BaseService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.Cookie; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java index 284e19a819..42039136d8 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataAnalysisService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.dto.CommandStateCount; -import cn.escheduler.api.dto.DefineUserDto; -import cn.escheduler.api.dto.TaskCountDto; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.*; +import org.apache.dolphinscheduler.api.dto.CommandStateCount; +import org.apache.dolphinscheduler.api.dto.DefineUserDto; +import org.apache.dolphinscheduler.api.dto.TaskCountDto; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -354,8 +354,8 @@ public class DataAnalysisService { } ITaskQueue tasksQueue = TaskQueueFactory.getTaskQueueInstance(); - List tasksQueueList = tasksQueue.getAllTasks(cn.escheduler.common.Constants.SCHEDULER_TASKS_QUEUE); - List tasksKillList = tasksQueue.getAllTasks(cn.escheduler.common.Constants.SCHEDULER_TASKS_KILL); + List tasksQueueList = tasksQueue.getAllTasks(org.apache.dolphinscheduler.common.Constants.SCHEDULER_TASKS_QUEUE); + List tasksKillList = tasksQueue.getAllTasks(org.apache.dolphinscheduler.common.Constants.SCHEDULER_TASKS_KILL); Map dataMap = new HashMap<>(); if (loginUser.getUserType() == UserType.ADMIN_USER){ diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java similarity index 91% rename from escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java index 2b6fc5159d..2f325d938e 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.job.db.*; -import cn.escheduler.common.utils.CommonUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.entity.DataSource; -import cn.escheduler.dao.entity.Resource; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.DataSourceMapper; -import cn.escheduler.dao.mapper.DataSourceUserMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.job.db.*; +import org.apache.dolphinscheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.dao.entity.Resource; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper; +import org.apache.dolphinscheduler.dao.mapper.DataSourceUserMapper; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,7 +47,7 @@ import java.sql.DriverManager; import java.sql.SQLException; import java.util.*; -import static cn.escheduler.common.utils.PropertyUtils.getString; +import static org.apache.dolphinscheduler.common.utils.PropertyUtils.getString; /** * datasource service @@ -65,7 +65,7 @@ public class DataSourceService extends BaseService{ public static final String PRINCIPAL = "principal"; public static final String DATABASE = "database"; public static final String USER_NAME = "userName"; - public static final String PASSWORD = cn.escheduler.common.Constants.PASSWORD; + public static final String PASSWORD = org.apache.dolphinscheduler.common.Constants.PASSWORD; public static final String OTHER = "other"; @@ -321,7 +321,7 @@ public class DataSourceService extends BaseService{ String connectionParams = dataSource.getConnectionParams(); JSONObject object = JSONObject.parseObject(connectionParams); - object.put(cn.escheduler.common.Constants.PASSWORD, cn.escheduler.common.Constants.XXXXXX); + object.put(org.apache.dolphinscheduler.common.Constants.PASSWORD, org.apache.dolphinscheduler.common.Constants.XXXXXX); dataSource.setConnectionParams(JSONUtils.toJson(object)); } @@ -394,13 +394,13 @@ public class DataSourceService extends BaseService{ case HIVE: case SPARK: if (CommonUtils.getKerberosStartupState()) { - System.setProperty(cn.escheduler.common.Constants.JAVA_SECURITY_KRB5_CONF, - getString(cn.escheduler.common.Constants.JAVA_SECURITY_KRB5_CONF_PATH)); + System.setProperty(org.apache.dolphinscheduler.common.Constants.JAVA_SECURITY_KRB5_CONF, + getString(org.apache.dolphinscheduler.common.Constants.JAVA_SECURITY_KRB5_CONF_PATH)); Configuration configuration = new Configuration(); - configuration.set(cn.escheduler.common.Constants.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); + configuration.set(org.apache.dolphinscheduler.common.Constants.HADOOP_SECURITY_AUTHENTICATION, "kerberos"); UserGroupInformation.setConfiguration(configuration); - UserGroupInformation.loginUserFromKeytab(getString(cn.escheduler.common.Constants.LOGIN_USER_KEY_TAB_USERNAME), - getString(cn.escheduler.common.Constants.LOGIN_USER_KEY_TAB_PATH)); + UserGroupInformation.loginUserFromKeytab(getString(org.apache.dolphinscheduler.common.Constants.LOGIN_USER_KEY_TAB_USERNAME), + getString(org.apache.dolphinscheduler.common.Constants.LOGIN_USER_KEY_TAB_PATH)); } if (dbType == DbType.HIVE){ datasource = JSONObject.parseObject(parameter, HiveDataSource.class); @@ -674,13 +674,13 @@ public class DataSourceService extends BaseService{ */ private String[] getHostsAndPort(String address) { String[] result = new String[2]; - String[] tmpArray = address.split(cn.escheduler.common.Constants.DOUBLE_SLASH); + String[] tmpArray = address.split(org.apache.dolphinscheduler.common.Constants.DOUBLE_SLASH); String hostsAndPorts = tmpArray[tmpArray.length - 1]; StringBuilder hosts = new StringBuilder(); - String[] hostPortArray = hostsAndPorts.split(cn.escheduler.common.Constants.COMMA); - String port = hostPortArray[0].split(cn.escheduler.common.Constants.COLON)[1]; + String[] hostPortArray = hostsAndPorts.split(org.apache.dolphinscheduler.common.Constants.COMMA); + String port = hostPortArray[0].split(org.apache.dolphinscheduler.common.Constants.COLON)[1]; for (String hostPort : hostPortArray) { - hosts.append(hostPort.split(cn.escheduler.common.Constants.COLON)[0]).append(cn.escheduler.common.Constants.COMMA); + hosts.append(hostPort.split(org.apache.dolphinscheduler.common.Constants.COLON)[0]).append(org.apache.dolphinscheduler.common.Constants.COMMA); } hosts.deleteCharAt(hosts.length() - 1); result[0] = hosts.toString(); diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java index c31bfa3152..bac3a48038 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ExecutorService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.ExecuteType; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.*; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.ProcessDefinitionMapper; -import cn.escheduler.dao.mapper.ProcessInstanceMapper; -import cn.escheduler.dao.mapper.ProjectMapper; +import org.apache.dolphinscheduler.api.enums.ExecuteType; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.*; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; +import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; +import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,7 +37,7 @@ import org.springframework.stereotype.Service; import java.text.ParseException; import java.util.*; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * executor service diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/LoggerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java similarity index 87% rename from escheduler-api/src/main/java/cn/escheduler/api/service/LoggerService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java index ec810f12f4..192b4382a5 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/LoggerService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.log.LogClient; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.Constants; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.log.LogClient; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/MonitorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java similarity index 84% rename from escheduler-api/src/main/java/cn/escheduler/api/service/MonitorService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java index 8c3d189371..9b26fcef22 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/MonitorService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.ZookeeperMonitor; -import cn.escheduler.common.enums.ZKNodeType; -import cn.escheduler.dao.MonitorDBDao; -import cn.escheduler.common.model.MasterServer; -import cn.escheduler.dao.entity.MonitorRecord; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.entity.ZookeeperRecord; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.ZookeeperMonitor; +import org.apache.dolphinscheduler.common.enums.ZKNodeType; +import org.apache.dolphinscheduler.dao.MonitorDBDao; +import org.apache.dolphinscheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.dao.entity.MonitorRecord; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.entity.ZookeeperRecord; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java index bfde9a0cf4..d1d564e059 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java @@ -14,26 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.dto.treeview.Instance; -import cn.escheduler.api.dto.treeview.TreeViewDto; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.*; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.ProcessDag; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.*; +import org.apache.dolphinscheduler.api.dto.treeview.Instance; +import org.apache.dolphinscheduler.api.dto.treeview.TreeViewDto; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.*; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.ProcessDag; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -42,6 +40,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.api.utils.CheckUtils; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -59,11 +60,7 @@ import java.io.InputStreamReader; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import static cn.escheduler.api.enums.Status.UPDATE_PROCESS_DEFINITION_ERROR; -import static cn.escheduler.api.service.SchedulerService.deleteSchedule; -import static cn.escheduler.api.utils.CheckUtils.checkOtherParams; -import static cn.escheduler.api.utils.CheckUtils.checkTaskNodeParameters; -import static cn.escheduler.common.Constants.CMDPARAM_SUB_PROCESS_DEFINE_ID; +import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_SUB_PROCESS_DEFINE_ID; /** * process definition service @@ -324,7 +321,7 @@ public class ProcessDefinitionService extends BaseDAGService { putMsg(result, Status.SUCCESS); } else { - putMsg(result, UPDATE_PROCESS_DEFINITION_ERROR); + putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR); } return result; } @@ -511,7 +508,7 @@ public class ProcessDefinitionService extends BaseDAGService { // set status schedule.setReleaseState(ReleaseState.OFFLINE); scheduleMapper.updateById(schedule); - deleteSchedule(project.getId(), schedule.getId()); + SchedulerService.deleteSchedule(project.getId(), schedule.getId()); } break; } @@ -794,14 +791,14 @@ public class ProcessDefinitionService extends BaseDAGService { // check whether the process definition json is normal for (TaskNode taskNode : taskNodes) { - if (!checkTaskNodeParameters(taskNode.getParams(), taskNode.getType())) { + if (!CheckUtils.checkTaskNodeParameters(taskNode.getParams(), taskNode.getType())) { logger.error("task node {} parameter invalid", taskNode.getName()); putMsg(result, Status.PROCESS_NODE_S_PARAMETER_INVALID, taskNode.getName()); return result; } // check extra params - checkOtherParams(taskNode.getExtras()); + CheckUtils.checkOtherParams(taskNode.getExtras()); } putMsg(result,Status.SUCCESS); } catch (Exception e) { diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java similarity index 95% rename from escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java index 23aa5b4317..e7bf3526de 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProcessInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java @@ -14,33 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.dto.gantt.GanttDto; -import cn.escheduler.api.dto.gantt.Task; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.Flag; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.common.utils.*; -import cn.escheduler.common.utils.placeholder.BusinessTimeUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.*; +import org.apache.dolphinscheduler.api.dto.gantt.GanttDto; +import org.apache.dolphinscheduler.api.dto.gantt.Task; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.common.utils.*; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +55,7 @@ import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * process instance service @@ -532,7 +532,7 @@ public class ProcessInstanceService extends BaseDAGService { try { logger.info("delete task queue node : {}",nodeValueSb.toString()); - tasksQueue.removeNode(cn.escheduler.common.Constants.SCHEDULER_TASKS_QUEUE, nodeValueSb.toString()); + tasksQueue.removeNode(org.apache.dolphinscheduler.common.Constants.SCHEDULER_TASKS_QUEUE, nodeValueSb.toString()); }catch (Exception e){ logger.error("delete task queue node : {}", nodeValueSb.toString()); } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java similarity index 91% rename from escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java index 4096e96f73..9f6a2d2578 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ProjectService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.Project; -import cn.escheduler.dao.entity.ProjectUser; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.ProcessDefinitionMapper; -import cn.escheduler.dao.mapper.ProjectMapper; -import cn.escheduler.dao.mapper.ProjectUserMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.ProjectUser; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; +import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; +import org.apache.dolphinscheduler.dao.mapper.ProjectUserMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.slf4j.Logger; @@ -36,7 +36,7 @@ import org.springframework.stereotype.Service; import java.util.*; -import static cn.escheduler.api.utils.CheckUtils.checkDesc; +import static org.apache.dolphinscheduler.api.utils.CheckUtils.checkDesc; /** * project service @@ -163,7 +163,7 @@ public class ProjectService extends BaseService{ List projectList = projectIPage.getRecords(); if(userId != 0){ for (Project project : projectList) { - project.setPerm(cn.escheduler.common.Constants.DEFAULT_ADMIN_PERMISSION); + project.setPerm(org.apache.dolphinscheduler.common.Constants.DEFAULT_ADMIN_PERMISSION); } } pageInfo.setTotalCount((int)projectIPage.getTotal()); @@ -338,7 +338,7 @@ public class ProjectService extends BaseService{ */ private boolean checkReadPermission(User user, Project project) { int permissionId = queryPermission(user, project); - return (permissionId & cn.escheduler.common.Constants.READ_PERMISSION) != 0; + return (permissionId & org.apache.dolphinscheduler.common.Constants.READ_PERMISSION) != 0; } /** @@ -350,11 +350,11 @@ public class ProjectService extends BaseService{ */ private int queryPermission(User user, Project project) { if (user.getUserType() == UserType.ADMIN_USER) { - return cn.escheduler.common.Constants.READ_PERMISSION; + return org.apache.dolphinscheduler.common.Constants.READ_PERMISSION; } if (project.getUserId() == user.getId()) { - return cn.escheduler.common.Constants.ALL_PERMISSIONS; + return org.apache.dolphinscheduler.common.Constants.ALL_PERMISSIONS; } ProjectUser projectUser = projectUserMapper.queryProjectRelation(project.getId(), user.getId()); diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java similarity index 94% rename from escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java index 8cf32eb699..7ffcd02fcb 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/QueueService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.dao.entity.Queue; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.QueueMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.dao.entity.Queue; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.QueueMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang.StringUtils; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java index d2e47c8826..9764d3a386 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/ResourcesService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ResourceType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.utils.FileUtils; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.common.utils.PropertyUtils; -import cn.escheduler.dao.mapper.*; -import cn.escheduler.dao.entity.Resource; -import cn.escheduler.dao.entity.Tenant; -import cn.escheduler.dao.entity.UdfFunc; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.utils.FileUtils; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.common.utils.PropertyUtils; +import org.apache.dolphinscheduler.dao.entity.Resource; +import org.apache.dolphinscheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.dao.entity.UdfFunc; +import org.apache.dolphinscheduler.dao.entity.User; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections.BeanMap; import org.apache.commons.lang.StringUtils; +import org.apache.dolphinscheduler.dao.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,8 +44,7 @@ import org.springframework.web.multipart.MultipartFile; import java.text.MessageFormat; import java.util.*; -import static cn.escheduler.api.enums.Status.UPDATE_RESOURCE_ERROR; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * resources service @@ -248,7 +247,7 @@ public class ResourcesService extends BaseService { } result.setData(resultMap); } catch (Exception e) { - logger.error(UPDATE_RESOURCE_ERROR.getMsg(), e); + logger.error(Status.UPDATE_RESOURCE_ERROR.getMsg(), e); putMsg(result, Status.UPDATE_RESOURCE_ERROR); return result; } @@ -354,7 +353,7 @@ public class ResourcesService extends BaseService { if (!HadoopUtils.getInstance().exists(resourcePath)) { createTenantDirIfNotExists(tenantCode); } - cn.escheduler.api.utils.FileUtils.copyFile(file, localFilename); + org.apache.dolphinscheduler.api.utils.FileUtils.copyFile(file, localFilename); HadoopUtils.getInstance().copyLocalToHdfs(localFilename, hdfsFilename, true, true); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -737,7 +736,7 @@ public class ResourcesService extends BaseService { logger.info("resource hdfs path is {} ", hdfsFileName); HadoopUtils.getInstance().copyHdfsToLocal(hdfsFileName, localFileName, false, true); - org.springframework.core.io.Resource file = cn.escheduler.api.utils.FileUtils.file2Resource(localFileName); + org.springframework.core.io.Resource file = org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName); return file; } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java index 8e34700078..aa64ad76b8 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.dto.ScheduleParam; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.FailureStrategy; -import cn.escheduler.common.enums.Priority; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.common.enums.WarningType; -import cn.escheduler.common.model.MasterServer; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.Project; -import cn.escheduler.dao.entity.Schedule; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.ProcessDefinitionMapper; -import cn.escheduler.dao.mapper.ProjectMapper; -import cn.escheduler.dao.mapper.ScheduleMapper; -import cn.escheduler.dao.utils.cron.CronUtils; -import cn.escheduler.server.quartz.ProcessScheduleJob; -import cn.escheduler.server.quartz.QuartzExecutors; +import org.apache.dolphinscheduler.api.dto.ScheduleParam; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.FailureStrategy; +import org.apache.dolphinscheduler.common.enums.Priority; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.Schedule; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; +import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; +import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper; +import org.apache.dolphinscheduler.dao.utils.cron.CronUtils; +import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob; +import org.apache.dolphinscheduler.server.quartz.QuartzExecutors; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; @@ -587,7 +587,7 @@ public class SchedulerService extends BaseService { return result; } List selfFireDateList = CronUtils.getSelfFireDateList(startTime, endTime,cronExpression); - result.put(Constants.DATA_LIST, selfFireDateList.stream().map(t -> DateUtils.dateToString(t)).limit(cn.escheduler.common.Constants.PREVIEW_SCHEDULE_EXECUTE_COUNT)); + result.put(Constants.DATA_LIST, selfFireDateList.stream().map(t -> DateUtils.dateToString(t)).limit(org.apache.dolphinscheduler.common.Constants.PREVIEW_SCHEDULE_EXECUTE_COUNT)); putMsg(result, Status.SUCCESS); return result; } diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/SessionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java similarity index 90% rename from escheduler-api/src/main/java/cn/escheduler/api/service/SessionService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java index 9408ab9c6c..391aa0fbe5 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/SessionService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SessionService.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.controller.BaseController; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.dao.entity.Session; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.SessionMapper; +import org.apache.dolphinscheduler.api.controller.BaseController; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.dao.entity.Session; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.SessionMapper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TaskInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java similarity index 84% rename from escheduler-api/src/main/java/cn/escheduler/api/service/TaskInstanceService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java index 6acb6d0133..6146eb6b58 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/TaskInstanceService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.Project; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.ProjectMapper; -import cn.escheduler.dao.mapper.TaskInstanceMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; +import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TaskRecordService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskRecordService.java similarity index 88% rename from escheduler-api/src/main/java/cn/escheduler/api/service/TaskRecordService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskRecordService.java index 32c972dcbf..61a98f8fd6 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/TaskRecordService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskRecordService.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.dao.TaskRecordDao; -import cn.escheduler.dao.entity.TaskRecord; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.dao.TaskRecordDao; +import org.apache.dolphinscheduler.dao.entity.TaskRecord; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -29,7 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * task record service diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java index 8599b0ec60..ab8a5dd3cc 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/TenantService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.common.utils.PropertyUtils; -import cn.escheduler.dao.entity.Tenant; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.TenantMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.common.utils.PropertyUtils; +import org.apache.dolphinscheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.TenantMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UdfFuncService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/service/UdfFuncService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java index 202a24291f..102e5b070a 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UdfFuncService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.UdfType; -import cn.escheduler.common.utils.PropertyUtils; -import cn.escheduler.dao.entity.Resource; -import cn.escheduler.dao.entity.UdfFunc; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.mapper.ResourceMapper; -import cn.escheduler.dao.mapper.UDFUserMapper; -import cn.escheduler.dao.mapper.UdfFuncMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.UdfType; +import org.apache.dolphinscheduler.common.utils.PropertyUtils; +import org.apache.dolphinscheduler.dao.entity.Resource; +import org.apache.dolphinscheduler.dao.entity.UdfFunc; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.mapper.ResourceMapper; +import org.apache.dolphinscheduler.dao.mapper.UDFUserMapper; +import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang.StringUtils; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java similarity index 96% rename from escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java index a32cfe194a..c9f7309e9b 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/UsersService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.CheckUtils; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ResourceType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.EncryptionUtils; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.common.utils.PropertyUtils; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.*; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.CheckUtils; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.EncryptionUtils; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.common.utils.PropertyUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -594,7 +594,7 @@ public class UsersService extends BaseService { */ public Result verifyUserName(String userName) { - cn.escheduler.api.utils.Result result = new cn.escheduler.api.utils.Result(); + Result result = new Result(); User user = userMapper.queryByUserNameAccurately(userName); if (user != null) { logger.error("user {} has exist, can't create again.", userName); diff --git a/escheduler-api/src/main/java/cn/escheduler/api/service/WorkerGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java similarity index 93% rename from escheduler-api/src/main/java/cn/escheduler/api/service/WorkerGroupService.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java index cdbc53bdbc..c8809908b8 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/service/WorkerGroupService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java @@ -14,20 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.dao.entity.WorkerGroup; -import cn.escheduler.dao.mapper.WorkerGroupMapper; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.dao.entity.WorkerGroup; +import org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.lang.invoke.WrongMethodTypeException; import java.util.Date; import java.util.HashMap; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/CheckUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java similarity index 87% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/CheckUtils.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java index 00c50f8263..ad03d03a39 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/CheckUtils.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; -import cn.escheduler.api.enums.Status; -import cn.escheduler.common.enums.ResUploadType; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.PropertyUtils; -import cn.escheduler.common.utils.TaskParametersUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.TaskParametersUtils; import org.apache.commons.lang.StringUtils; import java.text.MessageFormat; @@ -30,8 +28,6 @@ import java.util.HashMap; import java.util.Map; import java.util.regex.Pattern; -import static cn.escheduler.common.utils.PropertyUtils.getBoolean; - /** * check utils @@ -45,7 +41,7 @@ public class CheckUtils { * @param userName */ public static boolean checkUserName(String userName) { - return regexChecks(userName, cn.escheduler.common.Constants.REGEX_USER_NAME); + return regexChecks(userName, org.apache.dolphinscheduler.common.Constants.REGEX_USER_NAME); } /** @@ -54,7 +50,7 @@ public class CheckUtils { * @param email */ public static boolean checkEmail(String email) { - return email.length() > 5 && email.length() <= 40 && regexChecks(email, cn.escheduler.common.Constants.REGEX_MAIL_NAME) ; + return email.length() > 5 && email.length() <= 40 && regexChecks(email, org.apache.dolphinscheduler.common.Constants.REGEX_MAIL_NAME) ; } /** diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Constants.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Constants.java index 1dfe3ac470..70d6ceaab1 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/Constants.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Constants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; /** * web application constants diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/FileUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/FileUtils.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java index af31d4a828..6e0d61ae0f 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/FileUtils.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/PageInfo.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java similarity index 98% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/PageInfo.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java index 9d581e8d71..cd2d66dfd0 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/PageInfo.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; import java.util.List; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/Result.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java similarity index 97% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/Result.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java index 7c177827d4..9fc26c5246 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/Result.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/Result.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; /** * result diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java similarity index 99% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/ZooKeeperState.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java index 7d29e8618f..66fde70f9a 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/ZooKeeperState.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java @@ -1,4 +1,4 @@ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; import org.apache.commons.lang3.StringUtils; import org.apache.zookeeper.client.FourLetterWordMain; diff --git a/escheduler-api/src/main/java/cn/escheduler/api/utils/ZookeeperMonitor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java similarity index 88% rename from escheduler-api/src/main/java/cn/escheduler/api/utils/ZookeeperMonitor.java rename to dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java index 474a56f486..4b8623ea8b 100644 --- a/escheduler-api/src/main/java/cn/escheduler/api/utils/ZookeeperMonitor.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java @@ -1,9 +1,9 @@ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; -import cn.escheduler.common.enums.ZKNodeType; -import cn.escheduler.common.zk.AbstractZKClient; -import cn.escheduler.common.model.MasterServer; -import cn.escheduler.dao.entity.ZookeeperRecord; +import org.apache.dolphinscheduler.common.enums.ZKNodeType; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.dao.entity.ZookeeperRecord; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-api/src/main/resources/apiserver_logback.xml b/dolphinscheduler-api/src/main/resources/apiserver_logback.xml similarity index 86% rename from escheduler-api/src/main/resources/apiserver_logback.xml rename to dolphinscheduler-api/src/main/resources/apiserver_logback.xml index 43e6af951a..0d27889a65 100644 --- a/escheduler-api/src/main/resources/apiserver_logback.xml +++ b/dolphinscheduler-api/src/main/resources/apiserver_logback.xml @@ -20,9 +20,9 @@ INFO - ${log.base}/escheduler-api-server.log + ${log.base}/dolphinscheduler-api-server.log - ${log.base}/escheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log 168 64MB diff --git a/escheduler-api/src/main/resources/application.properties b/dolphinscheduler-api/src/main/resources/application.properties similarity index 90% rename from escheduler-api/src/main/resources/application.properties rename to dolphinscheduler-api/src/main/resources/application.properties index b817c18a4a..f956326cc5 100644 --- a/escheduler-api/src/main/resources/application.properties +++ b/dolphinscheduler-api/src/main/resources/application.properties @@ -4,7 +4,7 @@ server.port=12345 # session config server.servlet.session.timeout=7200 -server.servlet.context-path=/escheduler/ +server.servlet.context-path=/dolphinscheduler/ # file size limit for upload spring.servlet.multipart.max-file-size=1024MB diff --git a/escheduler-api/src/main/resources/combined_logback.xml b/dolphinscheduler-api/src/main/resources/combined_logback.xml similarity index 81% rename from escheduler-api/src/main/resources/combined_logback.xml rename to dolphinscheduler-api/src/main/resources/combined_logback.xml index fa1a95eeb2..0a5bd7ee24 100644 --- a/escheduler-api/src/main/resources/combined_logback.xml +++ b/dolphinscheduler-api/src/main/resources/combined_logback.xml @@ -13,8 +13,8 @@ INFO - - + + taskAppId ${log.base} @@ -33,13 +33,13 @@ - ${log.base}/escheduler-combined.log - + ${log.base}/dolphinscheduler-combined.log + INFO - ${log.base}/escheduler-combined.%d{yyyy-MM-dd_HH}.%i.log + ${log.base}/dolphinscheduler-combined.%d{yyyy-MM-dd_HH}.%i.log 168 200MB diff --git a/escheduler-api/src/main/resources/i18n/messages.properties b/dolphinscheduler-api/src/main/resources/i18n/messages.properties similarity index 100% rename from escheduler-api/src/main/resources/i18n/messages.properties rename to dolphinscheduler-api/src/main/resources/i18n/messages.properties diff --git a/escheduler-api/src/main/resources/i18n/messages_en_US.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from escheduler-api/src/main/resources/i18n/messages_en_US.properties rename to dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties diff --git a/escheduler-api/src/main/resources/i18n/messages_zh_CN.properties b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from escheduler-api/src/main/resources/i18n/messages_zh_CN.properties rename to dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties diff --git a/escheduler-api/src/test/java/cn/escheduler/api/HttpClientTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/HttpClientTest.java similarity index 99% rename from escheduler-api/src/test/java/cn/escheduler/api/HttpClientTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/HttpClientTest.java index 1d527b563c..f01decc013 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/HttpClientTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/HttpClientTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api; +package org.apache.dolphinscheduler.api; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/AbstractControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AbstractControllerTest.java similarity index 90% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/AbstractControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AbstractControllerTest.java index c56b2c1d04..4ed05dfc83 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/AbstractControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AbstractControllerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.service.SessionService; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.service.SessionService; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.lang3.StringUtils; import org.junit.*; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/DataAnalysisControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataAnalysisControllerTest.java similarity index 94% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/DataAnalysisControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataAnalysisControllerTest.java index 2722b68f58..c15fe3c1c4 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/DataAnalysisControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataAnalysisControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/DataSourceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataSourceControllerTest.java similarity index 93% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/DataSourceControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataSourceControllerTest.java index d78ba5c311..450a259e56 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/DataSourceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataSourceControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ExecutorControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecutorControllerTest.java similarity index 93% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/ExecutorControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecutorControllerTest.java index e89653fc95..ebbf1070bd 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ExecutorControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecutorControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/LoggerControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoggerControllerTest.java similarity index 90% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/LoggerControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoggerControllerTest.java index f4c5bd8ed8..d9aaeb3e8b 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/LoggerControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoggerControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/LoginControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoginControllerTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/LoginControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoginControllerTest.java index 97354fea60..4b808e00e6 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/LoginControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/LoginControllerTest.java @@ -14,24 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.context.WebApplicationContext; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/MonitorControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java similarity index 93% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/MonitorControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java index e4c6103cd0..941c4ce638 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/MonitorControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java @@ -1,8 +1,8 @@ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import com.alibaba.fastjson.JSONObject; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java similarity index 93% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java index bbd61afbec..e6b0f6a2a1 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessDefinitionControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java similarity index 91% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java index b3a2ea8c4a..0ad0222953 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProcessInstanceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProjectControllerTest.java similarity index 91% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProjectControllerTest.java index 7deda2fafa..a6c3138f0c 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ProjectControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProjectControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java similarity index 96% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java index 28e01ee51a..7a24b24efc 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/QueueControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/QueueControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ResourcesControllerTest.java similarity index 92% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ResourcesControllerTest.java index b1daf8132f..ef8fc723bc 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/ResourcesControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ResourcesControllerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.ResourceType; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import com.alibaba.fastjson.JSONObject; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java similarity index 92% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java index 71f63acdb5..0428ced85d 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/SchedulerControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java similarity index 92% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java index 96db23d061..50b8c140a2 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/TaskInstanceControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TaskInstanceControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java similarity index 90% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java index b4cb7db901..dd0544d9ba 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/TenantControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/TenantControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java similarity index 90% rename from escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java index 8425ccbd43..b47dd9ec89 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/controller/UsersControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/UsersControllerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.controller; +package org.apache.dolphinscheduler.api.controller; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/DataAnalysisServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/service/DataAnalysisServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java index 253cae0bba..b726bb2d28 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/DataAnalysisServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/DataSourceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java similarity index 82% rename from escheduler-api/src/test/java/cn/escheduler/api/service/DataSourceServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java index ef5305da38..0db97a6ccc 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/DataSourceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/ExecutorServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java similarity index 91% rename from escheduler-api/src/test/java/cn/escheduler/api/service/ExecutorServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java index 76d7af1685..a1f4465098 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/ExecutorServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/LoggerServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/service/LoggerServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java index 22b4a5906a..798e064d79 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/LoggerServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Result; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Result; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/ProcessDefinitionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java similarity index 90% rename from escheduler-api/src/test/java/cn/escheduler/api/service/ProcessDefinitionServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java index 06032fa5cc..c132772929 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/ProcessDefinitionServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import com.alibaba.fastjson.JSON; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/ProcessInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java similarity index 88% rename from escheduler-api/src/test/java/cn/escheduler/api/service/ProcessInstanceServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java index db88819f7c..b3f7d52a35 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/ProcessInstanceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import com.alibaba.fastjson.JSON; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/ResourcesServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java similarity index 81% rename from escheduler-api/src/test/java/cn/escheduler/api/service/ResourcesServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java index c857cd11a2..c372db7450 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/ResourcesServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.ResourceType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/SchedulerServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SchedulerServiceTest.java similarity index 81% rename from escheduler-api/src/test/java/cn/escheduler/api/service/SchedulerServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SchedulerServiceTest.java index 6a24f6438f..6395e07297 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/SchedulerServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SchedulerServiceTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.Project; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/SessionServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SessionServiceTest.java similarity index 88% rename from escheduler-api/src/test/java/cn/escheduler/api/service/SessionServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SessionServiceTest.java index 3df05d1fac..1920586706 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/SessionServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SessionServiceTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/TaskInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/service/TaskInstanceServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java index 4b4d6f5d01..a0c6d1e711 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/TaskInstanceServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/TenantServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/service/TenantServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java index 8326c84a58..12e5a1d093 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/TenantServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/UdfFuncServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UdfFuncServiceTest.java similarity index 82% rename from escheduler-api/src/test/java/cn/escheduler/api/service/UdfFuncServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UdfFuncServiceTest.java index d7953041fb..c4339cdd41 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/UdfFuncServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UdfFuncServiceTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.api.utils.PageInfo; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.api.utils.PageInfo; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/service/UsersServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java similarity index 84% rename from escheduler-api/src/test/java/cn/escheduler/api/service/UsersServiceTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java index acab8f707e..184617d392 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/service/UsersServiceTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.api.service; +package org.apache.dolphinscheduler.api.service; -import cn.escheduler.api.ApiApplicationServer; -import cn.escheduler.api.enums.Status; -import cn.escheduler.api.utils.Constants; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.api.ApiApplicationServer; +import org.apache.dolphinscheduler.api.enums.Status; +import org.apache.dolphinscheduler.api.utils.Constants; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.dao.entity.User; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java similarity index 83% rename from escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java rename to dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java index c79d6ea31d..f6facce97d 100644 --- a/escheduler-api/src/test/java/cn/escheduler/api/utils/ZookeeperMonitorUtilsTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java @@ -1,6 +1,6 @@ -package cn.escheduler.api.utils; +package org.apache.dolphinscheduler.api.utils; -import cn.escheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.common.model.MasterServer; import org.junit.Assert; import org.junit.Test; import java.util.List; diff --git a/escheduler-api/src/test/resources/dao/data_source.properties b/dolphinscheduler-api/src/test/resources/dao/data_source.properties similarity index 100% rename from escheduler-api/src/test/resources/dao/data_source.properties rename to dolphinscheduler-api/src/test/resources/dao/data_source.properties diff --git a/escheduler-common/pom.xml b/dolphinscheduler-common/pom.xml similarity index 98% rename from escheduler-common/pom.xml rename to dolphinscheduler-common/pom.xml index 712320fba6..013126a282 100644 --- a/escheduler-common/pom.xml +++ b/dolphinscheduler-common/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - escheduler - cn.analysys + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT - escheduler-common - escheduler-common + dolphinscheduler-common + dolphinscheduler-common http://maven.apache.org jar diff --git a/escheduler-common/src/main/java/cn/escheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/Constants.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java index 7eaa6b7926..9ca923f3b2 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/Constants.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common; +package org.apache.dolphinscheduler.common; -import cn.escheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; import java.util.regex.Pattern; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/IStoppable.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/IStoppable.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/IStoppable.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/IStoppable.java index 872d63c1d8..b0ffe4ac6d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/IStoppable.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/IStoppable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common; +package org.apache.dolphinscheduler.common; /** * server stop interface. diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/AlertStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/AlertStatus.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java index 6da093ed9a..4c371c88e0 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/AlertStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * alert status diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/AlertType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/AlertType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java index 1acf2db791..8260e6adb0 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/AlertType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * warning message notification method diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/CommandType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java index 3f83510819..7938e65f95 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/CommandType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * command types diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/CycleEnum.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/CycleEnum.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java index 48a9a5c163..633a3da409 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/CycleEnum.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CycleEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * cycle enums diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/DataType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/DataType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java index 0c0e3f323e..eda00d819a 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/DataType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DataType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * data types in user define parameter diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DbType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DbType.java index bf0ebba60c..03b54fea27 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/DbType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DbType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * data base types diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependResult.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/DependResult.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java index 7a9a9ac7c3..3e305f3920 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependResult.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * depend result diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependStrategy.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/DependStrategy.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependStrategy.java index c485351462..b409ca0b66 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * depend strategy diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependentRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/DependentRelation.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java index f95059f201..f84a37e4ed 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/DependentRelation.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/DependentRelation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * dependent relation: and or diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/Direct.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/Direct.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java index c7d8afc006..2eb9f3106c 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/Direct.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * parameter of stored procedure diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ExecutionStatus.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java index 4efcc09d6c..117c627f20 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ExecutionStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/FailureStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/FailureStrategy.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java index 3862d41537..6a691c6236 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/FailureStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/FailureStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * failure policy when some task node failed. diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/Flag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/Flag.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java index 25af24ff68..2dc484763a 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/Flag.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * have_script diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpCheckCondition.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/HttpCheckCondition.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java index b88ec01980..15d0ca4ddf 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpCheckCondition.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * http check condition diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpMethod.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/HttpMethod.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java index 32cbf1c42f..abceedd9f6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpMethod.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * http method diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpParametersType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/HttpParametersType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java index 21f4d8b3cc..857ebf612d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/HttpParametersType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * http parameters type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/Priority.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/Priority.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java index 3aa1f22539..3b33cb3621 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/Priority.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * define process and task priority diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ProgramType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ProgramType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java index 1754f652f8..45e88d63c2 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ProgramType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ProgramType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ReleaseState.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ReleaseState.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java index 47a5680de6..84e7ed2606 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ReleaseState.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * process define release state diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ResUploadType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ResUploadType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java index 65d8be8f92..0155c1268c 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ResUploadType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResUploadType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * data base types diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ResourceType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResourceType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ResourceType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResourceType.java index 2f1dcdde65..5c848268fe 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ResourceType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ResourceType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * resource type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/RunMode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/RunMode.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java index 09a13ef8d3..2ff507bc39 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/RunMode.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * complement data run mode diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/SelfDependStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SelfDependStrategy.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/SelfDependStrategy.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SelfDependStrategy.java index c5935bdc6e..31799700fa 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/SelfDependStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SelfDependStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * self depency strategy diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ServerEnum.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ServerEnum.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ServerEnum.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ServerEnum.java index 5c27f6567b..f9e0922d26 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ServerEnum.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ServerEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * cycle enums diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ShowType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ShowType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ShowType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ShowType.java index d7ee0e51af..4ca13471b6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ShowType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ShowType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * show type for email diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskDependType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/TaskDependType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java index 9d6a069592..ae0df68c48 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskDependType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * task node depend type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskRecordStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/TaskRecordStatus.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java index a0fb8f1dfc..b3d5426023 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskRecordStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskStateType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/TaskStateType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java index 678e8e5be8..05e6e469ac 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskStateType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskStateType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * type of task state diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskTimeoutStrategy.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/TaskTimeoutStrategy.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java index c454c98b10..557d9b8b77 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskTimeoutStrategy.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskTimeoutStrategy.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * task timeout strategy diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/TaskType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java index a212261db6..8575a87e54 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/TaskType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * task node type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/UdfType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/UdfType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java index 7114b52f50..1fbb8cb6a6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/UdfType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * UDF type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/UserType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/UserType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java index 7f36694295..62bb6b9d59 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/UserType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * user type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/WarningType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/WarningType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java index 9c8e5b3c12..7e319a4430 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/WarningType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * types for whether to send warning when process ending; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/enums/ZKNodeType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java similarity index 82% rename from escheduler-common/src/main/java/cn/escheduler/common/enums/ZKNodeType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java index 371231f727..36a3d86a80 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/enums/ZKNodeType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java @@ -1,4 +1,4 @@ -package cn.escheduler.common.enums; +package org.apache.dolphinscheduler.common.enums; /** * zk node type diff --git a/escheduler-common/src/main/java/cn/escheduler/common/graph/DAG.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/graph/DAG.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java index 43fbb26e5a..ee7faff3e7 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/graph/DAG.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.graph; +package org.apache.dolphinscheduler.common.graph; -import cn.escheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/BaseDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/BaseDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/BaseDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/BaseDataSource.java index f215d3e8c9..41a9b3a566 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/BaseDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/BaseDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; /** * data source base class diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/ClickHouseDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/ClickHouseDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java index b4df4d8f5a..c2e1f86d30 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/ClickHouseDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/ClickHouseDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/DataSourceFactory.java similarity index 80% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/DataSourceFactory.java index c710944bd2..86492d80d5 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/DataSourceFactory.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/DataSourceFactory.java @@ -14,15 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static cn.escheduler.common.Constants.*; - /** * produce datasource in this custom defined datasource factory. */ @@ -64,25 +63,25 @@ public class DataSourceFactory { public static void loadClass(DbType dbType) throws Exception{ switch (dbType){ case MYSQL : - Class.forName(JDBC_MYSQL_CLASS_NAME); + Class.forName(Constants.JDBC_MYSQL_CLASS_NAME); break; case POSTGRESQL : - Class.forName(JDBC_POSTGRESQL_CLASS_NAME); + Class.forName(Constants.JDBC_POSTGRESQL_CLASS_NAME); break; case HIVE : - Class.forName(JDBC_HIVE_CLASS_NAME); + Class.forName(Constants.JDBC_HIVE_CLASS_NAME); break; case SPARK : - Class.forName(JDBC_SPARK_CLASS_NAME); + Class.forName(Constants.JDBC_SPARK_CLASS_NAME); break; case CLICKHOUSE : - Class.forName(JDBC_CLICKHOUSE_CLASS_NAME); + Class.forName(Constants.JDBC_CLICKHOUSE_CLASS_NAME); break; case ORACLE : - Class.forName(JDBC_ORACLE_CLASS_NAME); + Class.forName(Constants.JDBC_ORACLE_CLASS_NAME); break; case SQLSERVER: - Class.forName(JDBC_SQLSERVER_CLASS_NAME); + Class.forName(Constants.JDBC_SQLSERVER_CLASS_NAME); break; default: logger.error("not support sql type: {},can't load class", dbType); diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java similarity index 93% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java index 0d45924e8e..fc1be356f5 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/HiveDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/HiveDataSource.java @@ -14,11 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.security.UserGroupInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/MySQLDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/MySQLDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java index 62d419e04c..0e850ee2de 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/MySQLDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/MySQLDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/OracleDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/OracleDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java index 5e245a590c..67c035d5be 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/OracleDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/OracleDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/PostgreDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/PostgreDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java index a0c893d6d6..332a9cb936 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/PostgreDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/PostgreDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java index f4d202a76e..084b10d425 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/SQLServerDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SQLServerDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/job/db/SparkDataSource.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/job/db/SparkDataSource.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java index 13aa06eaae..a15ec9abda 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/job/db/SparkDataSource.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/job/db/SparkDataSource.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.job.db; +package org.apache.dolphinscheduler.common.job.db; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/DateInterval.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/model/DateInterval.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java index aaf64325c5..e3bca6ecbf 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/DateInterval.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; import java.util.Date; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/DependentItem.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentItem.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/model/DependentItem.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentItem.java index 117a54db56..484a2f7ac8 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/DependentItem.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentItem.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; -import cn.escheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.DependResult; /** * dependent item diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/DependentTaskModel.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java similarity index 91% rename from escheduler-common/src/main/java/cn/escheduler/common/model/DependentTaskModel.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java index b642b2e5b5..93647bae04 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/DependentTaskModel.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DependentTaskModel.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; -import cn.escheduler.common.enums.DependentRelation; +import org.apache.dolphinscheduler.common.enums.DependentRelation; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/MasterServer.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterServer.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/model/MasterServer.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterServer.java index bb2f38cb14..cf5ae5f8c2 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/MasterServer.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/MasterServer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; import java.util.Date; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/TaskNode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/model/TaskNode.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java index e09775558c..076966ef72 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/TaskNode.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.Priority; -import cn.escheduler.common.enums.TaskTimeoutStrategy; -import cn.escheduler.common.task.TaskTimeoutParameter; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.Priority; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/model/TaskNodeRelation.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/model/TaskNodeRelation.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java index 979d6d48ee..f1a78029b6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/model/TaskNodeRelation.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNodeRelation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.model; +package org.apache.dolphinscheduler.common.model; public class TaskNodeRelation { diff --git a/escheduler-common/src/main/java/cn/escheduler/common/process/HttpProperty.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/process/HttpProperty.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java index ed7cc46a38..71a3fd9db8 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/process/HttpProperty.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/HttpProperty.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.process; +package org.apache.dolphinscheduler.common.process; -import cn.escheduler.common.enums.HttpParametersType; +import org.apache.dolphinscheduler.common.enums.HttpParametersType; import java.util.Objects; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/process/ProcessDag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java similarity index 91% rename from escheduler-common/src/main/java/cn/escheduler/common/process/ProcessDag.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java index e88f4a052a..465fcbe2f6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/process/ProcessDag.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ProcessDag.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.process; +package org.apache.dolphinscheduler.common.process; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/process/Property.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/process/Property.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java index cf95a5a26c..a0c7a928a1 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/process/Property.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.process; +package org.apache.dolphinscheduler.common.process; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.enums.Direct; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.enums.Direct; import java.util.Objects; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/process/ResourceInfo.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/process/ResourceInfo.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java index e6c64756c5..3c95ac648b 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/process/ResourceInfo.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.process; +package org.apache.dolphinscheduler.common.process; /** * resource info diff --git a/escheduler-common/src/main/java/cn/escheduler/common/queue/ITaskQueue.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/ITaskQueue.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/queue/ITaskQueue.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/ITaskQueue.java index 6f6e979797..054e25dd3a 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/queue/ITaskQueue.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/ITaskQueue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.queue; +package org.apache.dolphinscheduler.common.queue; import java.util.List; import java.util.Set; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueFactory.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueFactory.java similarity index 93% rename from escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueFactory.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueFactory.java index 3cc99142eb..efc2dd36bc 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueFactory.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.queue; +package org.apache.dolphinscheduler.common.queue; -import cn.escheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.CommonUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java index 2febb6ee13..e2fd56daff 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/queue/TaskQueueZkImpl.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.queue; +package org.apache.dolphinscheduler.common.queue; import java.util.ArrayList; @@ -26,11 +26,11 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.Bytes; -import cn.escheduler.common.utils.IpUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.Bytes; +import org.apache.dolphinscheduler.common.utils.IpUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; import org.apache.curator.framework.CuratorFramework; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.data.Stat; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/shell/AbstractShell.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/shell/AbstractShell.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java index 0880c4d5bb..d4ca6edd43 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/shell/AbstractShell.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/AbstractShell.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.shell; +package org.apache.dolphinscheduler.common.shell; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/shell/ShellExecutor.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/shell/ShellExecutor.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java index 1a23f9655e..832bcf6c9f 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/shell/ShellExecutor.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/shell/ShellExecutor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.shell; +package org.apache.dolphinscheduler.common.shell; import java.io.BufferedReader; import java.io.File; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/AbstractParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/AbstractParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java index 596bfcc87e..2d0322a6d7 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/AbstractParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task; +package org.apache.dolphinscheduler.common.task; -import cn.escheduler.common.process.Property; +import org.apache.dolphinscheduler.common.process.Property; import java.util.LinkedHashMap; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/IParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/task/IParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java index c4dbd6d421..8fb49eb1fa 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/IParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/IParameters.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task; +package org.apache.dolphinscheduler.common.task; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/TaskTimeoutParameter.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/TaskTimeoutParameter.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java index a2a2fb5f8c..245b1358a6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/TaskTimeoutParameter.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/TaskTimeoutParameter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task; +package org.apache.dolphinscheduler.common.task; -import cn.escheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; /** * task timeout parameter diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/dependent/DependentParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java similarity index 85% rename from escheduler-common/src/main/java/cn/escheduler/common/task/dependent/DependentParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java index 87143cdfb8..9ff1405722 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/dependent/DependentParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent/DependentParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.dependent; +package org.apache.dolphinscheduler.common.task.dependent; -import cn.escheduler.common.enums.DependentRelation; -import cn.escheduler.common.model.DependentTaskModel; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.enums.DependentRelation; +import org.apache.dolphinscheduler.common.model.DependentTaskModel; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.ArrayList; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/flink/FlinkParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/flink/FlinkParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java index 54dfcb7103..0638b3858e 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/flink/FlinkParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.flink; +package org.apache.dolphinscheduler.common.task.flink; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.process.ResourceInfo; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.process.ResourceInfo; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; import java.util.stream.Collectors; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/http/HttpParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java similarity index 88% rename from escheduler-common/src/main/java/cn/escheduler/common/task/http/HttpParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java index dc23f738b8..00b01afce3 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/http/HttpParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.http; +package org.apache.dolphinscheduler.common.task.http; -import cn.escheduler.common.enums.HttpCheckCondition; -import cn.escheduler.common.enums.HttpMethod; -import cn.escheduler.common.process.HttpProperty; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.enums.HttpCheckCondition; +import org.apache.dolphinscheduler.common.enums.HttpMethod; +import org.apache.dolphinscheduler.common.process.HttpProperty; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/mr/MapreduceParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapreduceParameters.java similarity index 93% rename from escheduler-common/src/main/java/cn/escheduler/common/task/mr/MapreduceParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapreduceParameters.java index 1839e93929..b8fd6ebcbf 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/mr/MapreduceParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapreduceParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.mr; +package org.apache.dolphinscheduler.common.task.mr; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.process.ResourceInfo; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.process.ResourceInfo; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; import java.util.stream.Collectors; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/procedure/ProcedureParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/procedure/ProcedureParameters.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/procedure/ProcedureParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/procedure/ProcedureParameters.java index 5e84051929..56ae65547d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/procedure/ProcedureParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/procedure/ProcedureParameters.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.procedure; +package org.apache.dolphinscheduler.common.task.procedure; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/python/PythonParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java similarity index 90% rename from escheduler-common/src/main/java/cn/escheduler/common/task/python/PythonParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java index 601b07b717..ae9cb4c7da 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/python/PythonParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.python; +package org.apache.dolphinscheduler.common.task.python; -import cn.escheduler.common.process.ResourceInfo; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.process.ResourceInfo; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; import java.util.stream.Collectors; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/shell/ShellParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/shell/ShellParameters.java similarity index 90% rename from escheduler-common/src/main/java/cn/escheduler/common/task/shell/ShellParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/shell/ShellParameters.java index 00fbcc114f..85b8acb46a 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/shell/ShellParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/shell/ShellParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.shell; +package org.apache.dolphinscheduler.common.task.shell; -import cn.escheduler.common.process.ResourceInfo; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.process.ResourceInfo; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; import java.util.stream.Collectors; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/spark/SparkParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/spark/SparkParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java index 087492b1f2..41263f0a74 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/spark/SparkParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.spark; +package org.apache.dolphinscheduler.common.task.spark; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.process.ResourceInfo; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.process.ResourceInfo; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.List; import java.util.stream.Collectors; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlBinds.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java similarity index 91% rename from escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlBinds.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java index 50975df3ed..1096185f45 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlBinds.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.sql; +package org.apache.dolphinscheduler.common.task.sql; -import cn.escheduler.common.process.Property; +import org.apache.dolphinscheduler.common.process.Property; import java.util.Map; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java index 0dc54b4c70..d65204a386 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.sql; +package org.apache.dolphinscheduler.common.task.sql; -import cn.escheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlType.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java index 3a7a48bfbd..871900a742 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/sql/SqlType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.sql; +package org.apache.dolphinscheduler.common.task.sql; public enum SqlType { diff --git a/escheduler-common/src/main/java/cn/escheduler/common/task/subprocess/SubProcessParameters.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java similarity index 91% rename from escheduler-common/src/main/java/cn/escheduler/common/task/subprocess/SubProcessParameters.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java index 0ad69ca2ef..21e3ce2248 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/task/subprocess/SubProcessParameters.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess/SubProcessParameters.java @@ -14,8 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.task.subprocess; -import cn.escheduler.common.task.AbstractParameters; +package org.apache.dolphinscheduler.common.task.subprocess; +import org.apache.dolphinscheduler.common.task.AbstractParameters; import java.util.ArrayList; import java.util.List; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/thread/Stopper.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/thread/Stopper.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java index 76f31c4a22..1c58f879a0 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/thread/Stopper.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/Stopper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.thread; +package org.apache.dolphinscheduler.common.thread; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadPoolExecutors.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadPoolExecutors.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadPoolExecutors.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadPoolExecutors.java index ea03026d3a..f88ea6d127 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadPoolExecutors.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadPoolExecutors.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.thread; +package org.apache.dolphinscheduler.common.thread; import com.google.common.collect.Lists; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java index 7b2fc928a6..0a4ed9b5ac 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/thread/ThreadUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/thread/ThreadUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.thread; +package org.apache.dolphinscheduler.common.thread; import com.google.common.util.concurrent.ThreadFactoryBuilder; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/Bytes.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Bytes.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/Bytes.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Bytes.java index 9cb4e094a6..4fb490bae6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/Bytes.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/Bytes.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/CollectionUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/CollectionUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java index 907b6b51a9..470242359e 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/CollectionUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CollectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.apache.commons.collections.BeanMap; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/CommonUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java similarity index 68% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/CommonUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java index b1d084f446..28470ef57d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/CommonUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/CommonUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ResUploadType; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ResUploadType; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; @@ -26,10 +26,6 @@ import org.slf4j.LoggerFactory; import java.io.File; -import static cn.escheduler.common.Constants.*; -import static cn.escheduler.common.utils.PropertyUtils.getBoolean; -import static cn.escheduler.common.utils.PropertyUtils.getString; - /** * common utils */ @@ -41,7 +37,7 @@ public class CommonUtils { * @return get the path of system environment variables */ public static String getSystemEnvPath() { - String envPath = getString(ESCHEDULER_ENV_PATH); + String envPath = PropertyUtils.getString(Constants.ESCHEDULER_ENV_PATH); if (StringUtils.isEmpty(envPath)) { envPath = System.getProperty("user.home") + File.separator + ".bash_profile"; } @@ -53,7 +49,7 @@ public class CommonUtils { * @return get queue implementation name */ public static String getQueueImplValue(){ - return getString(Constants.SCHEDULER_QUEUE_IMPL); + return PropertyUtils.getString(Constants.SCHEDULER_QUEUE_IMPL); } /** @@ -61,7 +57,7 @@ public class CommonUtils { * @return is develop mode */ public static boolean isDevelopMode() { - return getBoolean(DEVELOPMENT_STATE); + return PropertyUtils.getBoolean(Constants.DEVELOPMENT_STATE); } @@ -71,9 +67,9 @@ public class CommonUtils { * @return */ public static boolean getKerberosStartupState(){ - String resUploadStartupType = PropertyUtils.getString(cn.escheduler.common.Constants.RES_UPLOAD_STARTUP_TYPE); + String resUploadStartupType = PropertyUtils.getString(Constants.RES_UPLOAD_STARTUP_TYPE); ResUploadType resUploadType = ResUploadType.valueOf(resUploadStartupType); - Boolean kerberosStartupState = getBoolean(cn.escheduler.common.Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE); + Boolean kerberosStartupState = PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE); return resUploadType == ResUploadType.HDFS && kerberosStartupState; } @@ -83,12 +79,12 @@ public class CommonUtils { */ public static void loadKerberosConf()throws Exception{ if (CommonUtils.getKerberosStartupState()) { - System.setProperty(JAVA_SECURITY_KRB5_CONF, getString(JAVA_SECURITY_KRB5_CONF_PATH)); + System.setProperty(Constants.JAVA_SECURITY_KRB5_CONF, PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)); Configuration configuration = new Configuration(); - configuration.set(HADOOP_SECURITY_AUTHENTICATION, KERBEROS); + configuration.set(Constants.HADOOP_SECURITY_AUTHENTICATION, Constants.KERBEROS); UserGroupInformation.setConfiguration(configuration); - UserGroupInformation.loginUserFromKeytab(getString(LOGIN_USER_KEY_TAB_USERNAME), - getString(cn.escheduler.common.Constants.LOGIN_USER_KEY_TAB_PATH)); + UserGroupInformation.loginUserFromKeytab(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME), + PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH)); } } } diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/ConnectionUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ConnectionUtils.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/ConnectionUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ConnectionUtils.java index 33e5d41b97..2bbb45b64c 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/ConnectionUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ConnectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/DateUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/DateUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java index 045db346c6..c927a226e9 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/DateUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DateUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; +import org.apache.dolphinscheduler.common.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java index 0b4f566ae5..ee3c6260c6 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/DependentUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.DependentRelation; -import cn.escheduler.common.model.DateInterval; -import cn.escheduler.common.utils.dependent.DependentDateUtils; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.DependentRelation; +import org.apache.dolphinscheduler.common.model.DateInterval; +import org.apache.dolphinscheduler.common.utils.dependent.DependentDateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/EncryptionUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EncryptionUtils.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/EncryptionUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EncryptionUtils.java index f246d6d421..589827a975 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/EncryptionUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EncryptionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/EnumFieldUtil.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EnumFieldUtil.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/EnumFieldUtil.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EnumFieldUtil.java index 27e1955fac..7c4a54114c 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/EnumFieldUtil.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/EnumFieldUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; /** * enum field util diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/FileUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java similarity index 95% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/FileUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java index 205f894e04..1b535dcca8 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/FileUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/FileUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.apache.commons.io.Charsets; import org.apache.commons.io.IOUtils; @@ -26,8 +26,7 @@ import java.io.*; import java.nio.charset.Charset; import java.nio.charset.UnsupportedCharsetException; -import static cn.escheduler.common.Constants.*; -import static cn.escheduler.common.utils.PropertyUtils.getString; +import static org.apache.dolphinscheduler.common.Constants.*; /** * file utils @@ -60,7 +59,7 @@ public class FileUtils { * @return download file name */ public static String getDownloadFilename(String filename) { - return String.format("%s/%s/%s", getString(DATA_DOWNLOAD_BASEDIR_PATH), DateUtils.getCurrentTime(YYYYMMDDHHMMSS), filename); + return String.format("%s/%s/%s", PropertyUtils.getString(DATA_DOWNLOAD_BASEDIR_PATH), DateUtils.getCurrentTime(YYYYMMDDHHMMSS), filename); } /** @@ -71,7 +70,7 @@ public class FileUtils { * @return local file path */ public static String getUploadFilename(String tenantCode, String filename) { - return String.format("%s/%s/resources/%s",getString(DATA_BASEDIR_PATH), tenantCode, filename); + return String.format("%s/%s/resources/%s", PropertyUtils.getString(DATA_BASEDIR_PATH), tenantCode, filename); } /** @@ -84,7 +83,7 @@ public class FileUtils { */ public static String getProcessExecDir(int projectId, int processDefineId, int processInstanceId, int taskInstanceId) { - return String.format("%s/process/%s/%s/%s/%s", getString(PROCESS_EXEC_BASEPATH), Integer.toString(projectId), + return String.format("%s/process/%s/%s/%s/%s", PropertyUtils.getString(PROCESS_EXEC_BASEPATH), Integer.toString(projectId), Integer.toString(processDefineId), Integer.toString(processInstanceId),Integer.toString(taskInstanceId)); } @@ -96,7 +95,7 @@ public class FileUtils { * @return directory of process instances */ public static String getProcessExecDir(int projectId, int processDefineId, int processInstanceId) { - return String.format("%s/process/%s/%s/%s", getString(PROCESS_EXEC_BASEPATH), Integer.toString(projectId), + return String.format("%s/process/%s/%s/%s", PropertyUtils.getString(PROCESS_EXEC_BASEPATH), Integer.toString(projectId), Integer.toString(processDefineId), Integer.toString(processInstanceId)); } @@ -104,7 +103,7 @@ public class FileUtils { * @return get suffixes for resource files that support online viewing */ public static String getResourceViewSuffixs() { - return getString(RESOURCE_VIEW_SUFFIXS); + return PropertyUtils.getString(RESOURCE_VIEW_SUFFIXS); } /** diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java similarity index 85% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/HadoopUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java index 6bc33eca42..2c28263ef4 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/HadoopUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.ResUploadType; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.ResUploadType; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; @@ -39,10 +39,6 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import static cn.escheduler.common.Constants.*; -import static cn.escheduler.common.utils.PropertyUtils.*; -import static cn.escheduler.common.utils.PropertyUtils.getString; - /** * hadoop utils * single instance @@ -77,7 +73,7 @@ public class HadoopUtils implements Closeable { * init escheduler root path in hdfs */ private void initHdfsPath(){ - String hdfsPath = getString(Constants.DATA_STORE_2_HDFS_BASEPATH); + String hdfsPath = PropertyUtils.getString(Constants.DATA_STORE_2_HDFS_BASEPATH); Path path = new Path(hdfsPath); try { @@ -104,30 +100,30 @@ public class HadoopUtils implements Closeable { ResUploadType resUploadType = ResUploadType.valueOf(resUploadStartupType); if (resUploadType == ResUploadType.HDFS){ - if (getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE)){ + if (PropertyUtils.getBoolean(Constants.HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE)){ System.setProperty(Constants.JAVA_SECURITY_KRB5_CONF, - getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)); + PropertyUtils.getString(Constants.JAVA_SECURITY_KRB5_CONF_PATH)); configuration.set(Constants.HADOOP_SECURITY_AUTHENTICATION,"kerberos"); UserGroupInformation.setConfiguration(configuration); - UserGroupInformation.loginUserFromKeytab(getString(Constants.LOGIN_USER_KEY_TAB_USERNAME), - getString(Constants.LOGIN_USER_KEY_TAB_PATH)); + UserGroupInformation.loginUserFromKeytab(PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_USERNAME), + PropertyUtils.getString(Constants.LOGIN_USER_KEY_TAB_PATH)); } - String defaultFS = configuration.get(FS_DEFAULTFS); + String defaultFS = configuration.get(Constants.FS_DEFAULTFS); //first get key from core-site.xml hdfs-site.xml ,if null ,then try to get from properties file // the default is the local file system if(defaultFS.startsWith("file")){ - String defaultFSProp = getString(FS_DEFAULTFS); + String defaultFSProp = PropertyUtils.getString(Constants.FS_DEFAULTFS); if(StringUtils.isNotBlank(defaultFSProp)){ - Map fsRelatedProps = getPrefixedProperties("fs."); - configuration.set(FS_DEFAULTFS,defaultFSProp); + Map fsRelatedProps = PropertyUtils.getPrefixedProperties("fs."); + configuration.set(Constants.FS_DEFAULTFS,defaultFSProp); fsRelatedProps.entrySet().stream().forEach(entry -> configuration.set(entry.getKey(), entry.getValue())); }else{ logger.error("property:{} can not to be empty, please set!"); throw new RuntimeException("property:{} can not to be empty, please set!"); } }else{ - logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", FS_DEFAULTFS, defaultFS); + logger.info("get property:{} -> {}, from core-site.xml hdfs-site.xml ", Constants.FS_DEFAULTFS, defaultFS); } if (fs == null) { @@ -147,16 +143,16 @@ public class HadoopUtils implements Closeable { } } }else if (resUploadType == ResUploadType.S3){ - configuration.set(FS_DEFAULTFS,getString(FS_DEFAULTFS)); - configuration.set(FS_S3A_ENDPOINT,getString(FS_S3A_ENDPOINT)); - configuration.set(FS_S3A_ACCESS_KEY,getString(FS_S3A_ACCESS_KEY)); - configuration.set(FS_S3A_SECRET_KEY,getString(FS_S3A_SECRET_KEY)); + configuration.set(Constants.FS_DEFAULTFS, PropertyUtils.getString(Constants.FS_DEFAULTFS)); + configuration.set(Constants.FS_S3A_ENDPOINT, PropertyUtils.getString(Constants.FS_S3A_ENDPOINT)); + configuration.set(Constants.FS_S3A_ACCESS_KEY, PropertyUtils.getString(Constants.FS_S3A_ACCESS_KEY)); + configuration.set(Constants.FS_S3A_SECRET_KEY, PropertyUtils.getString(Constants.FS_S3A_SECRET_KEY)); fs = FileSystem.get(configuration); } - String rmHaIds = getString(YARN_RESOURCEMANAGER_HA_RM_IDS); - String appAddress = getString(Constants.YARN_APPLICATION_STATUS_ADDRESS); + String rmHaIds = PropertyUtils.getString(Constants.YARN_RESOURCEMANAGER_HA_RM_IDS); + String appAddress = PropertyUtils.getString(Constants.YARN_APPLICATION_STATUS_ADDRESS); if (!StringUtils.isEmpty(rmHaIds)) { appAddress = getAppAddress(appAddress, rmHaIds); logger.info("appAddress : {}", appAddress); @@ -185,7 +181,7 @@ public class HadoopUtils implements Closeable { * @return */ public String getApplicationUrl(String applicationId) { - return String.format(configuration.get(YARN_APPLICATION_STATUS_ADDRESS), applicationId); + return String.format(configuration.get(Constants.YARN_APPLICATION_STATUS_ADDRESS), applicationId); } /** @@ -376,19 +372,19 @@ public class HadoopUtils implements Closeable { String result = jsonObject.getJSONObject("app").getString("finalStatus"); switch (result) { - case ACCEPTED: + case Constants.ACCEPTED: return ExecutionStatus.SUBMITTED_SUCCESS; - case SUCCEEDED: + case Constants.SUCCEEDED: return ExecutionStatus.SUCCESS; - case NEW: - case NEW_SAVING: - case SUBMITTED: - case FAILED: + case Constants.NEW: + case Constants.NEW_SAVING: + case Constants.SUBMITTED: + case Constants.FAILED: return ExecutionStatus.FAILURE; - case KILLED: + case Constants.KILLED: return ExecutionStatus.KILL; - case RUNNING: + case Constants.RUNNING: default: return ExecutionStatus.RUNNING_EXEUTION; } @@ -399,7 +395,7 @@ public class HadoopUtils implements Closeable { * @return data hdfs path */ public static String getHdfsDataBasePath() { - String basePath = getString(DATA_STORE_2_HDFS_BASEPATH); + String basePath = PropertyUtils.getString(Constants.DATA_STORE_2_HDFS_BASEPATH); if ("/".equals(basePath)) { // if basepath is configured to /, the generated url may be //default/resources (with extra leading /) return ""; @@ -480,20 +476,20 @@ public class HadoopUtils implements Closeable { //get active ResourceManager String activeRM = YarnHAAdminUtils.getAcitveRMName(rmHa); - String[] split1 = appAddress.split(DOUBLE_SLASH); + String[] split1 = appAddress.split(Constants.DOUBLE_SLASH); if (split1.length != 2) { return null; } - String start = split1[0] + DOUBLE_SLASH; - String[] split2 = split1[1].split(COLON); + String start = split1[0] + Constants.DOUBLE_SLASH; + String[] split2 = split1[1].split(Constants.COLON); if (split2.length != 2) { return null; } - String end = COLON + split2[1]; + String end = Constants.COLON + split2[1]; return start + activeRM + end; } @@ -527,9 +523,9 @@ public class HadoopUtils implements Closeable { */ public static String getAcitveRMName(String rmIds) { - String[] rmIdArr = rmIds.split(COMMA); + String[] rmIdArr = rmIds.split(Constants.COMMA); - int activeResourceManagerPort = getInt(HADOOP_RESOURCE_MANAGER_HTTPADDRESS_PORT, 8088); + int activeResourceManagerPort = PropertyUtils.getInt(Constants.HADOOP_RESOURCE_MANAGER_HTTPADDRESS_PORT, 8088); String yarnUrl = "http://%s:" + activeResourceManagerPort + "/ws/v1/cluster/info"; @@ -540,11 +536,11 @@ public class HadoopUtils implements Closeable { */ state = getRMState(String.format(yarnUrl, rmIdArr[0])); - if (HADOOP_RM_STATE_ACTIVE.equals(state)) { + if (Constants.HADOOP_RM_STATE_ACTIVE.equals(state)) { return rmIdArr[0]; - } else if (HADOOP_RM_STATE_STANDBY.equals(state)) { + } else if (Constants.HADOOP_RM_STATE_STANDBY.equals(state)) { state = getRMState(String.format(yarnUrl, rmIdArr[1])); - if (HADOOP_RM_STATE_ACTIVE.equals(state)) { + if (Constants.HADOOP_RM_STATE_ACTIVE.equals(state)) { return rmIdArr[1]; } } else { @@ -552,7 +548,7 @@ public class HadoopUtils implements Closeable { } } catch (Exception e) { state = getRMState(String.format(yarnUrl, rmIdArr[1])); - if (HADOOP_RM_STATE_ACTIVE.equals(state)) { + if (Constants.HADOOP_RM_STATE_ACTIVE.equals(state)) { return rmIdArr[0]; } } diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/HttpUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HttpUtils.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/HttpUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HttpUtils.java index d0e3ccf9ee..684ea25270 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/HttpUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HttpUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; +import org.apache.dolphinscheduler.common.Constants; import org.apache.http.HttpEntity; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java index 972135ae89..669560c7d4 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/IpUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java index f48c7306aa..7f7ce30d08 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/OSUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/OSUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java index 0cf06d3b02..46b5b9670d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/OSUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.shell.ShellExecutor; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.shell.ShellExecutor; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java similarity index 90% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java index 50f4040ee6..c139ec7990 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/ParameterUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.utils.placeholder.BusinessTimeUtils; -import cn.escheduler.common.utils.placeholder.PlaceholderUtils; -import cn.escheduler.common.utils.placeholder.TimePlaceholderUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.PlaceholderUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.TimePlaceholderUtils; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; @@ -122,7 +122,7 @@ public class ParameterUtils { Map allParamMap = new HashMap<>(); //如果是补数，需要传入一个补数时间，根据任务类型 Map timeParams = BusinessTimeUtils - .getBusinessTime(commandType,scheduleTime); + .getBusinessTime(commandType, scheduleTime); if (timeParams != null) { allParamMap.putAll(timeParams); diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/PropertyUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java similarity index 94% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/PropertyUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java index 475cbfb72e..c775ce77bc 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/PropertyUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ResUploadType; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ResUploadType; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static cn.escheduler.common.Constants.COMMON_PROPERTIES_PATH; -import static cn.escheduler.common.Constants.HADOOP_PROPERTIES_PATH; +import static org.apache.dolphinscheduler.common.Constants.COMMON_PROPERTIES_PATH; +import static org.apache.dolphinscheduler.common.Constants.HADOOP_PROPERTIES_PATH; /** * property utils diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/ResInfo.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ResInfo.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/ResInfo.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ResInfo.java index 6a48d6bc89..e83dba71fb 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/ResInfo.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ResInfo.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.model.MasterServer; import java.util.Date; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/SchemaUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/SchemaUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java index 18f10b1bcd..4d0621beeb 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/SchemaUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/ScriptRunner.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/ScriptRunner.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java index a74d7e268c..f30b20f6b2 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/ScriptRunner.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ScriptRunner.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/TaskParametersUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java similarity index 73% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/TaskParametersUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java index b3fcade4a7..c5cbc78efd 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/TaskParametersUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.dependent.DependentParameters; -import cn.escheduler.common.task.flink.FlinkParameters; -import cn.escheduler.common.task.http.HttpParameters; -import cn.escheduler.common.task.mr.MapreduceParameters; -import cn.escheduler.common.task.procedure.ProcedureParameters; -import cn.escheduler.common.task.python.PythonParameters; -import cn.escheduler.common.task.shell.ShellParameters; -import cn.escheduler.common.task.spark.SparkParameters; -import cn.escheduler.common.task.sql.SqlParameters; -import cn.escheduler.common.task.subprocess.SubProcessParameters; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.dependent.DependentParameters; +import org.apache.dolphinscheduler.common.task.flink.FlinkParameters; +import org.apache.dolphinscheduler.common.task.http.HttpParameters; +import org.apache.dolphinscheduler.common.task.mr.MapreduceParameters; +import org.apache.dolphinscheduler.common.task.procedure.ProcedureParameters; +import org.apache.dolphinscheduler.common.task.python.PythonParameters; +import org.apache.dolphinscheduler.common.task.shell.ShellParameters; +import org.apache.dolphinscheduler.common.task.spark.SparkParameters; +import org.apache.dolphinscheduler.common.task.sql.SqlParameters; +import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters; import org.apache.commons.lang3.EnumUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/dependent/DependentDateUtils.java similarity index 97% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/dependent/DependentDateUtils.java index 0127fe2ca9..574343d0cb 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/dependent/DependentDateUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/dependent/DependentDateUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.dependent; +package org.apache.dolphinscheduler.common.utils.dependent; -import cn.escheduler.common.model.DateInterval; -import cn.escheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.model.DateInterval; +import org.apache.dolphinscheduler.common.utils.DateUtils; import java.util.ArrayList; import java.util.Date; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/BusinessTimeUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java similarity index 85% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/BusinessTimeUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java index c6c35d3d70..ad954a7569 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/BusinessTimeUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.placeholder; +package org.apache.dolphinscheduler.common.utils.placeholder; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; import java.util.Date; import java.util.HashMap; import java.util.Map; -import static cn.escheduler.common.Constants.PARAMETER_FORMAT_DATE; -import static cn.escheduler.common.Constants.PARAMETER_FORMAT_TIME; -import static cn.escheduler.common.utils.DateUtils.format; +import static org.apache.dolphinscheduler.common.Constants.PARAMETER_FORMAT_DATE; +import static org.apache.dolphinscheduler.common.Constants.PARAMETER_FORMAT_TIME; +import static org.apache.dolphinscheduler.common.utils.DateUtils.format; import static org.apache.commons.lang.time.DateUtils.addDays; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PlaceholderUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PlaceholderUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java index 7cdd0121bc..aaac020a0d 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PlaceholderUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.placeholder; +package org.apache.dolphinscheduler.common.utils.placeholder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PropertyPlaceholderHelper.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PropertyPlaceholderHelper.java similarity index 99% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PropertyPlaceholderHelper.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PropertyPlaceholderHelper.java index b1c337b6f7..d142bec5fe 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/PropertyPlaceholderHelper.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PropertyPlaceholderHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.placeholder; +package org.apache.dolphinscheduler.common.utils.placeholder; import org.apache.commons.logging.Log; diff --git a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java similarity index 98% rename from escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtils.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java index c57613b648..510f026585 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.placeholder; +package org.apache.dolphinscheduler.common.utils.placeholder; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * time place holder utils diff --git a/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java similarity index 96% rename from escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java rename to dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java index 7a1d63cdff..3c646c57ec 100644 --- a/escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.zk; +package org.apache.dolphinscheduler.common.zk; -import cn.escheduler.common.Constants; -import cn.escheduler.common.IStoppable; -import cn.escheduler.common.enums.ZKNodeType; -import cn.escheduler.common.model.MasterServer; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.common.utils.ResInfo; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.IStoppable; +import org.apache.dolphinscheduler.common.enums.ZKNodeType; +import org.apache.dolphinscheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.utils.ResInfo; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; @@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; import java.util.*; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** diff --git a/escheduler-common/src/main/resources/common/common.properties b/dolphinscheduler-common/src/main/resources/common/common.properties similarity index 100% rename from escheduler-common/src/main/resources/common/common.properties rename to dolphinscheduler-common/src/main/resources/common/common.properties diff --git a/escheduler-common/src/main/resources/common/hadoop/hadoop.properties b/dolphinscheduler-common/src/main/resources/common/hadoop/hadoop.properties similarity index 100% rename from escheduler-common/src/main/resources/common/hadoop/hadoop.properties rename to dolphinscheduler-common/src/main/resources/common/hadoop/hadoop.properties diff --git a/escheduler-common/src/main/resources/quartz.properties b/dolphinscheduler-common/src/main/resources/quartz.properties similarity index 100% rename from escheduler-common/src/main/resources/quartz.properties rename to dolphinscheduler-common/src/main/resources/quartz.properties diff --git a/escheduler-common/src/main/resources/zookeeper.properties b/dolphinscheduler-common/src/main/resources/zookeeper.properties similarity index 100% rename from escheduler-common/src/main/resources/zookeeper.properties rename to dolphinscheduler-common/src/main/resources/zookeeper.properties diff --git a/escheduler-common/src/test/java/cn/escheduler/common/graph/DAGTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/graph/DAGTest.java similarity index 99% rename from escheduler-common/src/test/java/cn/escheduler/common/graph/DAGTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/graph/DAGTest.java index 910181baf0..7f3c9b424e 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/graph/DAGTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/graph/DAGTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.graph; +package org.apache.dolphinscheduler.common.graph; import org.junit.After; import org.junit.Before; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/os/OSUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java similarity index 97% rename from escheduler-common/src/test/java/cn/escheduler/common/os/OSUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java index 4bf152bbf2..c493f12cc0 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/os/OSUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OSUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.os; +package org.apache.dolphinscheduler.common.os; -import cn.escheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/os/OshiTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OshiTest.java similarity index 99% rename from escheduler-common/src/test/java/cn/escheduler/common/os/OshiTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OshiTest.java index d27a111671..cfc069f9bb 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/os/OshiTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/os/OshiTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.os; +package org.apache.dolphinscheduler.common.os; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/TaskQueueImplTest.java similarity index 91% rename from escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/TaskQueueImplTest.java index 7b59309ff6..61d689fa4e 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/queue/TaskQueueImplTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/queue/TaskQueueImplTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.queue; +package org.apache.dolphinscheduler.common.queue; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.IpUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.common.zk.StandaloneZKServerForTest; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.IpUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.zk.StandaloneZKServerForTest; import org.junit.After; import org.junit.Before; import org.junit.Ignore; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/shell/ShellExecutorTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/shell/ShellExecutorTest.java similarity index 95% rename from escheduler-common/src/test/java/cn/escheduler/common/shell/ShellExecutorTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/shell/ShellExecutorTest.java index fe80708756..ac1222f3e6 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/shell/ShellExecutorTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/shell/ShellExecutorTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.shell; +package org.apache.dolphinscheduler.common.shell; -import cn.escheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/threadutils/ThreadPoolExecutorsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java similarity index 92% rename from escheduler-common/src/test/java/cn/escheduler/common/threadutils/ThreadPoolExecutorsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java index 86f9642ed6..582a29da2a 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/threadutils/ThreadPoolExecutorsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.threadutils; +package org.apache.dolphinscheduler.common.threadutils; -import cn.escheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/CollectionUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CollectionUtilsTest.java similarity index 97% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/CollectionUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CollectionUtilsTest.java index 73983115b1..394cf5f64a 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/CollectionUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CollectionUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/CommonUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CommonUtilsTest.java similarity index 97% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/CommonUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CommonUtilsTest.java index f4643e1847..f38b9b4c3b 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/CommonUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/CommonUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/DateUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java similarity index 97% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/DateUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java index 54ce1a3c9c..bcaa391042 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/DateUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DateUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DependentUtilsTest.java similarity index 95% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DependentUtilsTest.java index 8680ab0cb4..7311dcf5b6 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/DependentUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/DependentUtilsTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.DependentRelation; -import cn.escheduler.common.model.DateInterval; -import cn.escheduler.common.shell.ShellExecutorTest; -import cn.escheduler.common.utils.dependent.DependentDateUtils; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.DependentRelation; +import org.apache.dolphinscheduler.common.model.DateInterval; +import org.apache.dolphinscheduler.common.shell.ShellExecutorTest; +import org.apache.dolphinscheduler.common.utils.dependent.DependentDateUtils; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/FileUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/FileUtilsTest.java similarity index 95% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/FileUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/FileUtilsTest.java index fb9d78ad23..93faf465ad 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/FileUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/FileUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/HadoopUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HadoopUtilsTest.java similarity index 98% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/HadoopUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HadoopUtilsTest.java index 47e76e4286..6ca6360bf8 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/HadoopUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HadoopUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Ignore; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/HttpUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HttpUtilsTest.java similarity index 96% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/HttpUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HttpUtilsTest.java index df0f78405d..9a6e366f21 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/HttpUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/HttpUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java similarity index 92% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java index 11a03a2334..6f5f72631d 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/IpUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java @@ -1,10 +1,8 @@ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.*; - public class IpUtilsTest { @Test diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/JSONUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java similarity index 95% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/JSONUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java index 78631ff702..a7af13191d 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/JSONUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.enums.Direct; -import cn.escheduler.common.process.Property; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.enums.Direct; +import org.apache.dolphinscheduler.common.process.Property; import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/PropertyUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java similarity index 91% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/PropertyUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java index f1cb6ca4f8..2b9b0b54fd 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/PropertyUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; -import cn.escheduler.common.Constants; +import org.apache.dolphinscheduler.common.Constants; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/StringTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java similarity index 97% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/StringTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java index 4b753d4264..99a2cf05bc 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/StringTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StringTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils; +package org.apache.dolphinscheduler.common.utils; import org.junit.Assert; import org.junit.Test; diff --git a/escheduler-common/src/test/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java similarity index 67% rename from escheduler-common/src/test/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java index 66e32ecd5e..ee0a8aafe3 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java @@ -14,17 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.utils.placeholder; +package org.apache.dolphinscheduler.common.utils.placeholder; -import cn.escheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.DateUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import java.util.Date; -import static cn.escheduler.common.utils.placeholder.TimePlaceholderUtils.*; - public class TimePlaceholderUtilsTest { Date date = null; @@ -36,10 +34,10 @@ public class TimePlaceholderUtilsTest { @Test public void replacePlaceholdersT() { - Assert.assertEquals("2017test12017:***2016-12-31,20170102,20170130,20161227,20161231", replacePlaceholders("$[yyyy]test1$[yyyy:***]$[yyyy-MM-dd-1],$[month_begin(yyyyMMdd, 1)],$[month_end(yyyyMMdd, -1)],$[week_begin(yyyyMMdd, 1)],$[week_end(yyyyMMdd, -1)]", + Assert.assertEquals("2017test12017:***2016-12-31,20170102,20170130,20161227,20161231", TimePlaceholderUtils.replacePlaceholders("$[yyyy]test1$[yyyy:***]$[yyyy-MM-dd-1],$[month_begin(yyyyMMdd, 1)],$[month_end(yyyyMMdd, -1)],$[week_begin(yyyyMMdd, 1)],$[week_end(yyyyMMdd, -1)]", date, true)); - Assert.assertEquals("1483200061,1483290061,1485709261,1482771661,1483113600,1483203661", replacePlaceholders("$[timestamp(yyyyMMdd00mmss)]," + Assert.assertEquals("1483200061,1483290061,1485709261,1482771661,1483113600,1483203661", TimePlaceholderUtils.replacePlaceholders("$[timestamp(yyyyMMdd00mmss)]," + "$[timestamp(month_begin(yyyyMMddHHmmss, 1))]," + "$[timestamp(month_end(yyyyMMddHHmmss, -1))]," + "$[timestamp(week_begin(yyyyMMddHHmmss, 1))]," @@ -52,19 +50,19 @@ public class TimePlaceholderUtilsTest { @Test public void calcMinutesT() { - Assert.assertEquals("Sun Jan 01 01:01:01 CST 2017=yyyy", calcMinutes("yyyy", date).toString()); - Assert.assertEquals("Sun Jan 08 01:01:01 CST 2017=yyyyMMdd", calcMinutes("yyyyMMdd+7*1", date).toString()); - Assert.assertEquals("Sun Dec 25 01:01:01 CST 2016=yyyyMMdd", calcMinutes("yyyyMMdd-7*1", date).toString()); - Assert.assertEquals("Mon Jan 02 01:01:01 CST 2017=yyyyMMdd", calcMinutes("yyyyMMdd+1", date).toString()); - Assert.assertEquals("Sat Dec 31 01:01:01 CST 2016=yyyyMMdd", calcMinutes("yyyyMMdd-1", date).toString()); - Assert.assertEquals("Sun Jan 01 02:01:01 CST 2017=yyyyMMddHH", calcMinutes("yyyyMMddHH+1/24", date).toString()); - Assert.assertEquals("Sun Jan 01 00:01:01 CST 2017=yyyyMMddHH", calcMinutes("yyyyMMddHH-1/24", date).toString()); + Assert.assertEquals("Sun Jan 01 01:01:01 CST 2017=yyyy", TimePlaceholderUtils.calcMinutes("yyyy", date).toString()); + Assert.assertEquals("Sun Jan 08 01:01:01 CST 2017=yyyyMMdd", TimePlaceholderUtils.calcMinutes("yyyyMMdd+7*1", date).toString()); + Assert.assertEquals("Sun Dec 25 01:01:01 CST 2016=yyyyMMdd", TimePlaceholderUtils.calcMinutes("yyyyMMdd-7*1", date).toString()); + Assert.assertEquals("Mon Jan 02 01:01:01 CST 2017=yyyyMMdd", TimePlaceholderUtils.calcMinutes("yyyyMMdd+1", date).toString()); + Assert.assertEquals("Sat Dec 31 01:01:01 CST 2016=yyyyMMdd", TimePlaceholderUtils.calcMinutes("yyyyMMdd-1", date).toString()); + Assert.assertEquals("Sun Jan 01 02:01:01 CST 2017=yyyyMMddHH", TimePlaceholderUtils.calcMinutes("yyyyMMddHH+1/24", date).toString()); + Assert.assertEquals("Sun Jan 01 00:01:01 CST 2017=yyyyMMddHH", TimePlaceholderUtils.calcMinutes("yyyyMMddHH-1/24", date).toString()); } @Test public void calcMonthsT() { - Assert.assertEquals("Mon Jan 01 01:01:01 CST 2018=yyyyMMdd", calcMonths("add_months(yyyyMMdd,12*1)", date).toString()); - Assert.assertEquals("Fri Jan 01 01:01:01 CST 2016=yyyyMMdd", calcMonths("add_months(yyyyMMdd,-12*1)", date).toString()); + Assert.assertEquals("Mon Jan 01 01:01:01 CST 2018=yyyyMMdd", TimePlaceholderUtils.calcMonths("add_months(yyyyMMdd,12*1)", date).toString()); + Assert.assertEquals("Fri Jan 01 01:01:01 CST 2016=yyyyMMdd", TimePlaceholderUtils.calcMonths("add_months(yyyyMMdd,-12*1)", date).toString()); } } \ No newline at end of file diff --git a/escheduler-common/src/test/java/cn/escheduler/common/zk/StandaloneZKServerForTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/StandaloneZKServerForTest.java similarity index 96% rename from escheduler-common/src/test/java/cn/escheduler/common/zk/StandaloneZKServerForTest.java rename to dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/StandaloneZKServerForTest.java index b9562ec0d0..2a76244f8b 100644 --- a/escheduler-common/src/test/java/cn/escheduler/common/zk/StandaloneZKServerForTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/zk/StandaloneZKServerForTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.common.zk; +package org.apache.dolphinscheduler.common.zk; import java.io.File; import java.util.Properties; -import cn.escheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; import org.apache.zookeeper.server.ServerConfig; import org.apache.zookeeper.server.ZooKeeperServerMain; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; diff --git a/escheduler-common/src/test/resources/dao/data_source.properties b/dolphinscheduler-common/src/test/resources/dao/data_source.properties similarity index 100% rename from escheduler-common/src/test/resources/dao/data_source.properties rename to dolphinscheduler-common/src/test/resources/dao/data_source.properties diff --git a/escheduler-dao/pom.xml b/dolphinscheduler-dao/pom.xml similarity index 94% rename from escheduler-dao/pom.xml rename to dolphinscheduler-dao/pom.xml index 710f862263..4aa4cafe6d 100644 --- a/escheduler-dao/pom.xml +++ b/dolphinscheduler-dao/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - cn.analysys - escheduler + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT - escheduler-dao - escheduler-dao + dolphinscheduler-dao + dolphinscheduler-dao http://maven.apache.org UTF-8 @@ -132,8 +132,8 @@ commons-configuration - cn.analysys - escheduler-common + org.apache.dolphinscheduler + dolphinscheduler-common protobuf-java diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/AbstractBaseDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AbstractBaseDao.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/AbstractBaseDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AbstractBaseDao.java index ce18b15528..0b1090c368 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/AbstractBaseDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AbstractBaseDao.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; /** * base dao diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/AlertDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java index 237872fc08..6ff582d2e9 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/AlertDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; -import cn.escheduler.common.enums.AlertStatus; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.enums.ShowType; -import cn.escheduler.dao.entity.Alert; -import cn.escheduler.dao.mapper.AlertMapper; -import cn.escheduler.dao.mapper.UserAlertGroupMapper; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.common.enums.AlertStatus; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.dao.mapper.AlertMapper; +import org.apache.dolphinscheduler.dao.mapper.UserAlertGroupMapper; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.User; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/App.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java similarity index 86% rename from escheduler-dao/src/main/java/cn/escheduler/dao/App.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java index 9534041ae6..c39cc2439a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/App.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java @@ -1,4 +1,4 @@ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/DaoFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/DaoFactory.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/DaoFactory.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/DaoFactory.java index 8237a85805..36887593da 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/DaoFactory.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/DaoFactory.java @@ -14,9 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; -import cn.escheduler.dao.utils.BeanContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/MonitorDBDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/MonitorDBDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java index 1aafac7266..e542dfeae4 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/MonitorDBDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; -import cn.escheduler.common.Constants; -import cn.escheduler.dao.entity.MonitorRecord; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.dao.entity.MonitorRecord; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java index 1f705f64a6..59a0d339ac 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/ProcessDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/ProcessDao.java @@ -14,27 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.*; -import cn.escheduler.common.model.DateInterval; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.common.task.subprocess.SubProcessParameters; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.IpUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.*; -import cn.escheduler.dao.mapper.*; -import cn.escheduler.dao.utils.cron.CronUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.*; +import org.apache.dolphinscheduler.common.model.DateInterval; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.IpUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.utils.cron.CronUtils; import com.alibaba.fastjson.JSONObject; import com.cronutils.model.Cron; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory; +import org.apache.dolphinscheduler.dao.entity.*; +import org.apache.dolphinscheduler.dao.mapper.*; import org.quartz.CronExpression; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,8 +46,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; -import static cn.escheduler.common.Constants.*; -import static cn.escheduler.dao.datasource.ConnectionFactory.getMapper; +import static org.apache.dolphinscheduler.common.Constants.*; /** * process relative dao that some mappers in this. @@ -118,19 +118,19 @@ public class ProcessDao extends AbstractBaseDao { */ @Override protected void init() { - userMapper = getMapper(UserMapper.class); - processDefineMapper = getMapper(ProcessDefinitionMapper.class); - processInstanceMapper = getMapper(ProcessInstanceMapper.class); - dataSourceMapper = getMapper(DataSourceMapper.class); - processInstanceMapMapper = getMapper(ProcessInstanceMapMapper.class); - taskInstanceMapper = getMapper(TaskInstanceMapper.class); - commandMapper = getMapper(CommandMapper.class); - scheduleMapper = getMapper(ScheduleMapper.class); - udfFuncMapper = getMapper(UdfFuncMapper.class); - resourceMapper = getMapper(ResourceMapper.class); - workerGroupMapper = getMapper(WorkerGroupMapper.class); + userMapper = ConnectionFactory.getMapper(UserMapper.class); + processDefineMapper = ConnectionFactory.getMapper(ProcessDefinitionMapper.class); + processInstanceMapper = ConnectionFactory.getMapper(ProcessInstanceMapper.class); + dataSourceMapper = ConnectionFactory.getMapper(DataSourceMapper.class); + processInstanceMapMapper = ConnectionFactory.getMapper(ProcessInstanceMapMapper.class); + taskInstanceMapper = ConnectionFactory.getMapper(TaskInstanceMapper.class); + commandMapper = ConnectionFactory.getMapper(CommandMapper.class); + scheduleMapper = ConnectionFactory.getMapper(ScheduleMapper.class); + udfFuncMapper = ConnectionFactory.getMapper(UdfFuncMapper.class); + resourceMapper = ConnectionFactory.getMapper(ResourceMapper.class); + workerGroupMapper = ConnectionFactory.getMapper(WorkerGroupMapper.class); taskQueue = TaskQueueFactory.getTaskQueueInstance(); - tenantMapper = getMapper(TenantMapper.class); + tenantMapper = ConnectionFactory.getMapper(TenantMapper.class); } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java index 6d2942fe15..2c522a2183 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/TaskRecordDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/TaskRecordDao.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao; +package org.apache.dolphinscheduler.dao; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.TaskRecordStatus; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.dao.entity.TaskRecord; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.TaskRecordStatus; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.dao.entity.TaskRecord; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/config/MybatisPlusConfig.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/config/MybatisPlusConfig.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java index fa5723ba9d..340960bb81 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/config/MybatisPlusConfig.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.escheduler.dao.config; +package org.apache.dolphinscheduler.dao.config; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/config/YmlConfig.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/YmlConfig.java old mode 100755 new mode 100644 similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/config/YmlConfig.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/YmlConfig.java index c650fc2fe0..0caf7bc826 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/config/YmlConfig.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/config/YmlConfig.java @@ -1,4 +1,4 @@ -package cn.escheduler.dao.config; +package org.apache.dolphinscheduler.dao.config; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/datasource/ConnectionFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/datasource/ConnectionFactory.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java index f256726bc3..6737c172e0 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/datasource/ConnectionFactory.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/ConnectionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.datasource; +package org.apache.dolphinscheduler.dao.datasource; import com.alibaba.druid.pool.DruidDataSource; import org.apache.ibatis.mapping.Environment; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/datasource/DatabaseConfiguration.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java similarity index 100% rename from escheduler-dao/src/main/java/cn/escheduler/dao/datasource/DatabaseConfiguration.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DatabaseConfiguration.java diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/AccessToken.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/AccessToken.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java index c6cd118a42..11d50a5b08 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/AccessToken.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AccessToken.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Alert.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Alert.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java index 77dfe8ea3d..f5c56656d7 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Alert.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Alert.java @@ -14,14 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.apache.dolphinscheduler.common.enums.AlertStatus; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.ShowType; import java.util.Date; import java.util.HashMap; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/AlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java similarity index 94% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/AlertGroup.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java index 6fef715aa9..62afb4969a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/AlertGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/AlertGroup.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.AlertType; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Command.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Command.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java index 36cfa38ce3..2f42dfee0b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Command.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.apache.dolphinscheduler.common.enums.*; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/CommandCount.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CommandCount.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/CommandCount.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CommandCount.java index 334d41562a..158169b727 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/CommandCount.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CommandCount.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.CommandType; public class CommandCount { diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/CycleDependency.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CycleDependency.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/CycleDependency.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CycleDependency.java index 3ac5533f98..e7ad38b6ea 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/CycleDependency.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/CycleDependency.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.common.enums.CycleEnum; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/DataSource.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java index 5fd4db6dd8..f61b8339e8 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DataSource.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.enums.DbType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DatasourceUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/DatasourceUser.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java index 2379891630..85331cf8e2 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DatasourceUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DatasourceUser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DefinitionGroupByUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DefinitionGroupByUser.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/DefinitionGroupByUser.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DefinitionGroupByUser.java index d8d409aebb..12f1a5fbe4 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/DefinitionGroupByUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/DefinitionGroupByUser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; /** * count definition number group by user diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Dependency.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Dependency.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Dependency.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Dependency.java index cb85d8137b..8cac28368e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Dependency.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Dependency.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.SelfDependStrategy; +import org.apache.dolphinscheduler.common.enums.SelfDependStrategy; /** * dependency diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ErrorCommand.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ErrorCommand.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java index 2af75329a3..ef92bea7b0 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ErrorCommand.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import org.apache.dolphinscheduler.common.enums.*; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ExecuteStatusCount.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ExecuteStatusCount.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java index 9b224e3913..0e877a60f8 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ExecuteStatusCount.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ExecuteStatusCount.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; /** * count execute state diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/MonitorRecord.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/MonitorRecord.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/MonitorRecord.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/MonitorRecord.java index be3adc76f1..23b17a37d5 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/MonitorRecord.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/MonitorRecord.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessData.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessData.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessData.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessData.java index e292b71e97..2dce01d9f8 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessData.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessData.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; import java.util.List; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessDefinition.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessDefinition.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java index c171c7c125..a86f0c7c2f 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessDefinition.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; -import cn.escheduler.common.process.Property; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.process.Property; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java similarity index 99% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java index 7af74ac06a..770cd98e56 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import lombok.Data; +import org.apache.dolphinscheduler.common.enums.*; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstanceMap.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstanceMap.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java index 2951598c8b..0c6424ec8a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProcessInstanceMap.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstanceMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Project.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Project.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java index 35bebac39b..3dcaf4490a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Project.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProjectUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProjectUser.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java index cd44f9c1c6..0e089d8cba 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ProjectUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProjectUser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Queue.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Queue.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java index feac009a84..94f8206914 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Queue.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Queue.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Resource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Resource.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java index a631753ad9..1ac3f3ef34 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Resource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Resource.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.ResourceType; +import org.apache.dolphinscheduler.common.enums.ResourceType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ResourcesUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ResourcesUser.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java index 92ab7955bf..b1d66880e7 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ResourcesUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ResourcesUser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java index 069ebc3ae6..ab7cf47d7e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Schedule.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java @@ -14,14 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.*; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import org.apache.dolphinscheduler.common.enums.FailureStrategy; +import org.apache.dolphinscheduler.common.enums.Priority; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.WarningType; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Session.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Session.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java index 90a2685d68..a5c27b17cd 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Session.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Session.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskInstance.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskInstance.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java index 1f65a18f39..41b3fdcfa5 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskInstance.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java @@ -14,11 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.enums.*; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.Priority; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.utils.JSONUtils; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskRecord.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskRecord.java similarity index 99% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskRecord.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskRecord.java index 02b85dbf8b..9a6979525b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/TaskRecord.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskRecord.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java index f4db4d6068..ba8ff2ea3a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/Tenant.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Tenant.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UDFUser.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/UDFUser.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java index 2d8c6a4f87..c89008e915 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UDFUser.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UDFUser.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UdfFunc.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/UdfFunc.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java index c34f72f9e0..a42492e094 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UdfFunc.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UdfFunc.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.UdfType; +import org.apache.dolphinscheduler.common.enums.UdfType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/User.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/User.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java index e763561e37..f1a7d4a009 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/User.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/User.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; -import cn.escheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.enums.UserType; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UserAlertGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/UserAlertGroup.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java index 293aa370e8..d8fe65610a 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/UserAlertGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/UserAlertGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerGroup.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerGroup.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java index 6f4c689cf7..29532eef83 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerGroup.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerGroup.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerServer.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerServer.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerServer.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerServer.java index a15e5da033..977302061b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/WorkerServer.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/WorkerServer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ZookeeperRecord.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/entity/ZookeeperRecord.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java index cb0a9104c6..6b86ac5c11 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/entity/ZookeeperRecord.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ZookeeperRecord.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.entity; +package org.apache.dolphinscheduler.dao.entity; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.java index 00d18d66ff..0f0236c86c 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AccessTokenMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.AccessToken; +import org.apache.dolphinscheduler.dao.entity.AccessToken; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertGroupMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertGroupMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java index 975b770d77..4b3090523c 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertGroupMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.dao.entity.AlertGroup; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.dao.entity.AlertGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertMapper.java similarity index 86% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertMapper.java index c9ef374bbb..8d3e6c8381 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/AlertMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/AlertMapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.AlertStatus; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.common.enums.AlertStatus; +import org.apache.dolphinscheduler.dao.entity.Alert; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java index ebf45bdd04..cbaa1df30f 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/CommandMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Command; -import cn.escheduler.dao.entity.CommandCount; +import org.apache.dolphinscheduler.dao.entity.Command; +import org.apache.dolphinscheduler.dao.entity.CommandCount; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.java index fc88c1edc8..3d9aec234f 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.dao.entity.DataSource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceUserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceUserMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.java index 61a57936ce..77f73c1c79 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceUserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.DatasourceUser; +import org.apache.dolphinscheduler.dao.entity.DatasourceUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java similarity index 87% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java index c3675726b1..bc2591f7e4 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ErrorCommandMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.CommandCount; -import cn.escheduler.dao.entity.ErrorCommand; +import org.apache.dolphinscheduler.dao.entity.CommandCount; +import org.apache.dolphinscheduler.dao.entity.ErrorCommand; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java similarity index 87% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java index e8029f8b34..1f4a49731d 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java @@ -14,13 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.Flag; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.DefinitionGroupByUser; -import cn.escheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.DefinitionGroupByUser; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.java index cfa2c7619c..856cea9712 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.ProcessInstanceMap; +import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java index 075412287a..4096cf7036 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.*; -import cn.escheduler.dao.entity.ExecuteStatusCount; -import cn.escheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java index bd069f789e..6f735af353 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java @@ -14,10 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Project; -import com.amazonaws.services.dynamodbv2.model.transform.ProjectionJsonUnmarshaller; +import org.apache.dolphinscheduler.dao.entity.Project; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectUserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectUserMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java index a8bf4ac3c5..646d3aaa75 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectUserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.ProjectUser; +import org.apache.dolphinscheduler.dao.entity.ProjectUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/QueueMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/QueueMapper.java index 02e93a5ff5..5ed4b10be3 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/QueueMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Queue; +import org.apache.dolphinscheduler.dao.entity.Queue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java index bb2f25138c..c4bdbdacc8 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Resource; +import org.apache.dolphinscheduler.dao.entity.Resource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceUserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.java similarity index 90% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceUserMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.java index bf74bda905..dfade7b4e7 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ResourceUserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.ResourcesUser; +import org.apache.dolphinscheduler.dao.entity.ResourcesUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java index b3c46bc2b1..1493754070 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ScheduleMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Schedule; +import org.apache.dolphinscheduler.dao.entity.Schedule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/SessionMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/SessionMapper.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/SessionMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/SessionMapper.java index 1d17cd6527..94a5cc4f1f 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/SessionMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/SessionMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Session; +import org.apache.dolphinscheduler.dao.entity.Session; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java index 9e81d8d9c6..6f491de700 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TaskInstanceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java @@ -14,13 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.*; -import cn.escheduler.dao.entity.ExecuteStatusCount; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.UserType; import org.apache.ibatis.annotations.Param; import java.util.Date; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TenantMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TenantMapper.java index b590edb4d9..2cf90520a9 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TenantMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.dao.entity.Tenant; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UDFUserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UDFUserMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.java index 919c3e0a32..3eb477d31b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UDFUserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.UDFUser; +import org.apache.dolphinscheduler.dao.entity.UDFUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UdfFuncMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java similarity index 94% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UdfFuncMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java index 02614a62b3..3fa872f826 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UdfFuncMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.UdfFunc; +import org.apache.dolphinscheduler.dao.entity.UdfFunc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserAlertGroupMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java similarity index 88% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserAlertGroupMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java index 6c8215e24d..2361c498c7 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserAlertGroupMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.User; -import cn.escheduler.dao.entity.UserAlertGroup; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.entity.UserAlertGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java similarity index 94% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java index 240a3221ab..61cf2bbad7 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/UserMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.dao.entity.User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/WorkerGroupMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/mapper/WorkerGroupMapper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.java index 07929b95e9..87e3dacd7e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/WorkerGroupMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.WorkerGroup; +import org.apache.dolphinscheduler.dao.entity.WorkerGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/DolphinSchedulerManager.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/DolphinSchedulerManager.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/DolphinSchedulerManager.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/DolphinSchedulerManager.java index f15312a3f3..aea6f2674b 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/DolphinSchedulerManager.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/DolphinSchedulerManager.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade; +package org.apache.dolphinscheduler.dao.upgrade; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.utils.SchemaUtils; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.utils.SchemaUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/MysqlUpgradeDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java similarity index 94% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/MysqlUpgradeDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java index d6a8974d28..6c6d333965 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/MysqlUpgradeDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade; +package org.apache.dolphinscheduler.dao.upgrade; -import cn.escheduler.common.utils.ConnectionUtils; -import cn.escheduler.dao.datasource.ConnectionFactory; +import org.apache.dolphinscheduler.common.utils.ConnectionUtils; +import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/PostgresqlUpgradeDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/PostgresqlUpgradeDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java index 87ac1b4bde..7866f36d34 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/PostgresqlUpgradeDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/PostgresqlUpgradeDao.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade; +package org.apache.dolphinscheduler.dao.upgrade; -import cn.escheduler.common.utils.ConnectionUtils; -import cn.escheduler.dao.datasource.ConnectionFactory; +import org.apache.dolphinscheduler.common.utils.ConnectionUtils; +import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/UpgradeDao.java similarity index 96% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/UpgradeDao.java index 820d8a3c99..fa57b7b49f 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/UpgradeDao.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade; +package org.apache.dolphinscheduler.dao.upgrade; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.common.utils.ConnectionUtils; -import cn.escheduler.common.utils.SchemaUtils; -import cn.escheduler.common.utils.ScriptRunner; -import cn.escheduler.dao.AbstractBaseDao; -import cn.escheduler.dao.datasource.ConnectionFactory; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.common.utils.ConnectionUtils; +import org.apache.dolphinscheduler.common.utils.SchemaUtils; +import org.apache.dolphinscheduler.common.utils.ScriptRunner; +import org.apache.dolphinscheduler.dao.AbstractBaseDao; +import org.apache.dolphinscheduler.dao.datasource.ConnectionFactory; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateDolphinScheduler.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/CreateDolphinScheduler.java similarity index 92% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateDolphinScheduler.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/CreateDolphinScheduler.java index 2c827dfea4..a70541cc7c 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateDolphinScheduler.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/CreateDolphinScheduler.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade.shell; +package org.apache.dolphinscheduler.dao.upgrade.shell; -import cn.escheduler.dao.upgrade.DolphinSchedulerManager; +import org.apache.dolphinscheduler.dao.upgrade.DolphinSchedulerManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitDolphinScheduler.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/InitDolphinScheduler.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitDolphinScheduler.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/InitDolphinScheduler.java index 4c01f7413b..3a0e00f655 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitDolphinScheduler.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/InitDolphinScheduler.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade.shell; +package org.apache.dolphinscheduler.dao.upgrade.shell; -import cn.escheduler.dao.upgrade.DolphinSchedulerManager; +import org.apache.dolphinscheduler.dao.upgrade.DolphinSchedulerManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java similarity index 91% rename from escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java index 56e706cd2b..9da418ba68 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.upgrade.shell; +package org.apache.dolphinscheduler.dao.upgrade.shell; -import cn.escheduler.dao.upgrade.DolphinSchedulerManager; +import org.apache.dolphinscheduler.dao.upgrade.DolphinSchedulerManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/BeanContext.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/BeanContext.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/BeanContext.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/BeanContext.java index b768c050fe..6719c299a0 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/BeanContext.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/BeanContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils; +package org.apache.dolphinscheduler.dao.utils; import org.springframework.beans.BeansException; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/DagHelper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/DagHelper.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java index 5f9c2fdf58..dba8aeb9fc 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/DagHelper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils; +package org.apache.dolphinscheduler.dao.utils; -import cn.escheduler.common.enums.TaskDependType; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.ProcessDag; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.entity.ProcessData; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.common.enums.TaskDependType; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.ProcessDag; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessData; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/PropertyUtils.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PropertyUtils.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/PropertyUtils.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PropertyUtils.java index e91dcedb2c..ca08bf1c2e 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/PropertyUtils.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PropertyUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils; +package org.apache.dolphinscheduler.dao.utils; -import cn.escheduler.common.Constants; +import org.apache.dolphinscheduler.common.Constants; import com.baomidou.mybatisplus.core.toolkit.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/AbstractCycle.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/AbstractCycle.java similarity index 98% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/AbstractCycle.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/AbstractCycle.java index 3d75256737..d062c6abf6 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/AbstractCycle.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/AbstractCycle.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils.cron; +package org.apache.dolphinscheduler.dao.utils.cron; -import cn.escheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.common.enums.CycleEnum; import com.cronutils.model.Cron; import com.cronutils.model.field.CronField; import com.cronutils.model.field.CronFieldName; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CronUtils.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java similarity index 95% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CronUtils.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java index 7579ac15a0..be5dfd0396 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CronUtils.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CronUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils.cron; +package org.apache.dolphinscheduler.dao.utils.cron; -import cn.escheduler.common.enums.CycleEnum; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.utils.DateUtils; import com.cronutils.model.Cron; import com.cronutils.model.definition.CronDefinitionBuilder; import com.cronutils.parser.CronParser; @@ -30,8 +30,8 @@ import org.slf4j.LoggerFactory; import java.text.ParseException; import java.util.*; -import static cn.escheduler.dao.utils.cron.CycleFactory.*; import static com.cronutils.model.CronType.QUARTZ; +import static org.apache.dolphinscheduler.dao.utils.cron.CycleFactory.*; /** diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleFactory.java similarity index 97% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleFactory.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleFactory.java index fabf289b96..3e5013edeb 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleFactory.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils.cron; +package org.apache.dolphinscheduler.dao.utils.cron; -import cn.escheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.common.enums.CycleEnum; import com.cronutils.model.Cron; import com.cronutils.model.field.expression.Always; import com.cronutils.model.field.expression.QuestionMark; diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleLinks.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleLinks.java similarity index 93% rename from escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleLinks.java rename to dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleLinks.java index 3447e267ca..f4e08cefc9 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/utils/cron/CycleLinks.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/cron/CycleLinks.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.utils.cron; +package org.apache.dolphinscheduler.dao.utils.cron; -import cn.escheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.common.enums.CycleEnum; import com.cronutils.model.Cron; import java.util.ArrayList; diff --git a/escheduler-dao/src/main/resources/application.yml b/dolphinscheduler-dao/src/main/resources/application.yml similarity index 100% rename from escheduler-dao/src/main/resources/application.yml rename to dolphinscheduler-dao/src/main/resources/application.yml diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml similarity index 74% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml index a9f0c59ba1..15dceb7004 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AccessTokenMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_access_token t left join t_escheduler_user u on t.user_id = u.id where 1 = 1 diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml similarity index 60% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml index 2a86c9360d..347cef0022 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertGroupMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_alertgroup where 1 = 1 @@ -9,20 +9,20 @@ order by update_time desc - select * from t_escheduler_alertgroup where group_name=#{groupName} - select * from t_escheduler_alertgroup t left join t_escheduler_relation_user_alertgroup r on t.id=r.alertgroup_id where r.user_id=#{userId} - select * from t_escheduler_alertgroup where group_type=#{alertType} - select * from t_escheduler_alertgroup order by update_time desc diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml similarity index 59% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml index 5211ae0751..4c38335992 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/AlertMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_alert where alert_status = #{alertStatus} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml similarity index 80% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml index fdc8aecb5b..b1455412e7 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/CommandMapper.xml @@ -1,14 +1,14 @@ - - select command.* from t_escheduler_command command join t_escheduler_process_definition definition on command.process_definition_id = definition.id where definition.release_state = 1 AND definition.flag = 1 order by update_time asc limit 1 - select cmd.command_type as state, count(1) as count from t_escheduler_command cmd, t_escheduler_process_definition process where cmd.process_definition_id = process.id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml similarity index 70% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml index 177b054ad0..101313cdd7 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_datasource where type=#{type} @@ -18,7 +18,7 @@ - select * from t_escheduler_datasource where 1 =1 @@ -37,22 +37,22 @@ order by update_time desc - select * from t_escheduler_datasource where name=#{name} - select datasource.* from t_escheduler_datasource datasource, t_escheduler_relation_datasource_user rel where datasource.id = rel.datasource_id AND rel.user_id = #{userId} - select * from t_escheduler_datasource where user_id ]]> #{userId} - select * from t_escheduler_datasource where type = #{type} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml similarity index 82% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml index b833a1fbdc..0178b36acf 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/DataSourceUserMapper.xml @@ -1,6 +1,6 @@ - + delete from t_escheduler_datasource_user where user_id = #{userId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml similarity index 81% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml index 70cbefc65a..278b7cbc08 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ErrorCommandMapper.xml @@ -1,7 +1,7 @@ - - select cmd.command_type as commandType, count(1) as count from t_escheduler_error_command cmd, t_escheduler_process_definition process where cmd.process_definition_id = process.id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml similarity index 76% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml index 5c4237115b..e16ae81ea1 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessDefinitionMapper.xml @@ -1,7 +1,7 @@ - - select pd.*,u.user_name,p.name as project_name,t.tenant_code,t.tenant_name,q.queue,q.queue_name from t_escheduler_process_definition pd JOIN t_escheduler_user u ON pd.user_id = u.id @@ -11,7 +11,7 @@ WHERE p.id = #{projectId} and pd.name = #{processDefinitionName} - SELECT td.*,sc.schedule_release_state FROM t_escheduler_process_definition td left join (select process_definition_id,release_state as schedule_release_state from t_escheduler_schedules group by process_definition_id,release_state) sc on sc.process_definition_id = td.id @@ -24,13 +24,13 @@ order by sc.schedule_release_state desc,td.update_time desc - select * from t_escheduler_process_definition where project_id = #{projectId} order by create_time desc - select * from t_escheduler_process_definition where id in @@ -38,7 +38,7 @@ #{i} - SELECT td.user_id as user_id, tu.user_name as user_name, count(0) as count FROM t_escheduler_process_definition td JOIN t_escheduler_user tu on tu.id=td.user_id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml similarity index 74% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml index ff85f35ed7..7bffa89941 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapMapper.xml @@ -1,19 +1,19 @@ - + delete from t_escheduler_relation_process_instance where parent_process_instance_id=#{parentProcessId} - select * from t_escheduler_relation_process_instance where parent_process_instance_id = #{parentProcessId} and parent_task_instance_id = #{parentTaskId} - select * from t_escheduler_relation_process_instance where process_instance_id = #{subProcessId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml similarity index 81% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml index c92cc030a9..f956c148b7 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml @@ -1,12 +1,12 @@ - - select inst.* from t_escheduler_process_instance inst where inst.id = #{processId} - select * from t_escheduler_process_instance where 1=1 @@ -19,7 +19,7 @@ order by id asc - select instance.* from t_escheduler_process_instance instance join t_escheduler_process_definition define ON instance.process_definition_id = define.id @@ -59,7 +59,7 @@ set state = #{destState} where state = #{originState} - select t.state, count(0) as count from t_escheduler_process_instance t join t_escheduler_process_definition d on d.id=t.process_definition_id @@ -77,13 +77,13 @@ group by t.state - select * from t_escheduler_process_instance where process_definition_id=#{processDefinitionId} order by start_time desc limit #{size} - select * from t_escheduler_process_instance where process_definition_id=#{processDefinitionId} @@ -92,7 +92,7 @@ order by end_time desc limit 1 - select * from t_escheduler_process_instance where 1=1 @@ -108,7 +108,7 @@ order by start_time desc limit 1 - select * from t_escheduler_process_instance where process_definition_id=#{processDefinitionId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml similarity index 77% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml index 49c71230ec..e34576811d 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml @@ -1,20 +1,20 @@ - - select p.*,u.user_name as user_name from t_escheduler_project join t_escheduler_user u on p.user_id = u.id where p.id = #{projectId} - select p.* u.user_name as user_name from t_escheduler_project join t_escheduler_user u on p.user_id = u.id where p.name = #{projectName} and p.flag = 1 - select p.*, u.user_name as user_name, (SELECT COUNT(*) FROM t_escheduler_process_definition AS def WHERE def.project_id = p.id) AS def_count, (SELECT COUNT(*) FROM t_escheduler_process_definition def, t_escheduler_process_instance inst WHERE def.id = inst.process_definition_id AND def.project_id = p.id AND inst.state=1 ) as inst_running_count, @@ -34,7 +34,7 @@ order by p.create_time desc - select p.*, u.user_name as user_name, (SELECT COUNT(*) FROM t_escheduler_process_definition AS def WHERE def.project_id = p.id) AS def_count, (SELECT COUNT(*) FROM t_escheduler_process_definition def, t_escheduler_process_instance inst WHERE def.id = inst.process_definition_id AND def.project_id = p.id AND inst.state=1 ) as inst_running_count, @@ -46,17 +46,17 @@ order by p.create_time desc - select p.* from t_escheduler_project p,t_escheduler_relation_project_user rel where p.id = rel.project_id and p.flag=1 and rel.user_id= #{userId} - select * from t_escheduler_project where flag=1 and user_id ]]> #{userId} - select * from t_escheduler_project where user_id = #{userId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml similarity index 74% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml index 0d9ba3bac5..ad2b9b9343 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml @@ -1,6 +1,6 @@ - + delete from t_escheduler_relation_project_user where 1=1 @@ -9,7 +9,7 @@ and project_id = #{projectId} - select * from t_escheduler_relation_project_user where project_id = #{projectId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml similarity index 72% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml index 6b4a391a24..6eac1d3bc8 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_queue where 1= 1 @@ -10,7 +10,7 @@ order by update_time desc - select * from t_escheduler_queue where 1=1 diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml similarity index 77% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml index 643f9856f2..acd8376be8 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_resources where 1= 1 @@ -15,7 +15,7 @@ and user_id = #{userId} - select * from t_escheduler_resources where 1 = 1 @@ -25,7 +25,7 @@ and id in (select resources_id from t_escheduler_relation_resources_user where user_id=#{userId} union select id as resources_id from t_escheduler_resources where user_id=#{userId}) - select * from t_escheduler_resources where `type`=#{type} @@ -38,12 +38,12 @@ order by update_time desc - select r.* from t_escheduler_resources r,t_escheduler_relation_resources_user rel where r.id = rel.resources_id AND rel.user_id = #{userId} - select * from t_escheduler_resources where user_id ]]> #{userId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml similarity index 84% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml index d6c3323993..deeadac8d3 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ResourceUserMapper.xml @@ -1,6 +1,6 @@ - + delete from t_escheduler_relation_resources_user diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml similarity index 75% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml index 76b321aac6..51edd4aad9 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml @@ -1,7 +1,7 @@ - - select p_f.name as process_definition_name, p.name as project_name,u.user_name,s.* from t_escheduler_schedules s join t_escheduler_process_definition p_f on s.process_definition_id = p_f.id @@ -13,7 +13,7 @@ order by s.update_time desc - select p_f.name as process_definition_name, p_f.description as definition_description, p.name as project_name,u.user_name,s.* from t_escheduler_schedules s join t_escheduler_process_definition p_f on s.process_definition_id = p_f.id @@ -21,7 +21,7 @@ join t_escheduler_user as u on s.user_id = u.id where p.name = #{projectName} - select * from t_escheduler_schedules where 1= 1 @@ -33,7 +33,7 @@ and release_state = 1 - select * from t_escheduler_schedules where process_definition_id =#{processDefinitionId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml similarity index 58% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml index 530d0e984c..e8fd7f3eb3 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/SessionMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_session where user_id = #{userId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml similarity index 84% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml index 91260d43dc..d60153e1de 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TaskInstanceMapper.xml @@ -1,12 +1,12 @@ - + update t_escheduler_task_instance set state = #{destStatus} where host = #{host} and state in (#{states}) - select *, UNIX_TIMESTAMP(end_time)-UNIX_TIMESTAMP(start_time) as duration from t_escheduler_task_instance where id=#{taskInstanceId} @@ -18,14 +18,14 @@ and state = #{state} and flag = 1 - select *, UNIX_TIMESTAMP(end_time)-UNIX_TIMESTAMP(start_time) as duration from t_escheduler_task_instance WHERE process_instance_id = #{processInstanceId} and flag = #{flag} order by start_time desc - select * from t_escheduler_task_instance where 1 = 1 @@ -34,7 +34,7 @@ and state in (#{states}) - select state, count(0) as count from t_escheduler_task_instance t left join t_escheduler_process_definition d on d.id=t.process_definition_id @@ -46,7 +46,7 @@ and t.flag = 1 and t.start_time > #{startTime} and t.start_time #{endTime} group by t.state - select * from t_escheduler_task_instance where process_instance_id = #{processInstanceId} @@ -67,7 +67,7 @@ - select instance.*,process.name as process_instance_name, UNIX_TIMESTAMP(instance.end_time)-UNIX_TIMESTAMP(instance.start_time) as duration from t_escheduler_task_instance instance join t_escheduler_process_definition define ON instance.process_definition_id = define.id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml similarity index 67% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml index b975f7a7e1..91fede5406 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/TenantMapper.xml @@ -1,18 +1,18 @@ - - SELECT t.*,q.queue_name,q.queue FROM t_escheduler_tenant t,t_escheduler_queue q WHERE t.queue_id = q.id and t.id = #{tenantId} - select * from t_escheduler_tenant where tenant_code = #{tenantCode} - SELECT t.*,q.queue_name FROM t_escheduler_tenant t,t_escheduler_queue q WHERE t.queue_id = q.id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml similarity index 83% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml index a34df12ee9..a47c3e4b67 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UDFUserMapper.xml @@ -1,6 +1,6 @@ - + delete from t_escheduler_relation_udfs_user where `user_id` = #{userId} diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml similarity index 74% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml index acde3ef7be..c0aed4fc76 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UdfFuncMapper.xml @@ -1,7 +1,7 @@ - - select * from t_escheduler_udfs where 1 = 1 @@ -13,7 +13,7 @@ order by id asc - select * from t_escheduler_udfs where 1=1 @@ -27,7 +27,7 @@ order by create_time desc - select * from t_escheduler_udfs where `type` = #{type} @@ -37,12 +37,12 @@ union select id as udf_id from t_escheduler_udfs where user_id=#{userId}) - select * from t_escheduler_udfs where user_id ]]> #{userId} - SELECT u.* from t_escheduler_udfs u,t_escheduler_relation_udfs_user rel WHERE u.id = rel.udf_id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml similarity index 72% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml index 1b972028ec..090388dedf 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserAlertGroupMapper.xml @@ -1,17 +1,17 @@ - + delete from t_escheduler_relation_user_alertgroup where `alertgroup_id` = #{alertgroupId} - SELECT u.* FROM t_escheduler_relation_user_alertgroup g_u JOIN t_escheduler_user u on g_u.user_id = u.id WHERE g_u.alertgroup_id = #{alertgroupId} - SELECT u.* FROM t_escheduler_relation_user_alertgroup g_u JOIN t_escheduler_user u on g_u.user_id = u.id diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml similarity index 68% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml index d8fecc85e6..39dd9871bc 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/UserMapper.xml @@ -1,21 +1,21 @@ - + - select * from t_escheduler_user where user_type=1; - select * from t_escheduler_user where user_name=#{userName} - select * from t_escheduler_user where user_name=#{userName} and user_password = #{password} - select u.id,u.user_name,u.user_password,u.user_type,u.email,u.phone,u.tenant_id,u.create_time, u.update_time,t.tenant_name, case when u.queue ]]> '' then u.queue else q.queue_name end as queue, q.queue_name @@ -29,25 +29,25 @@ order by u.update_time desc - select u.*, t.tenant_name, case when u.queue ]]> '' then u.queue else q.queue_name end as queue_name from t_escheduler_user u,t_escheduler_tenant t,t_escheduler_queue q WHERE u.tenant_id = t.id and t.queue_id = q.id and u.id = #{userId} - select u.* from t_escheduler_user u, t_escheduler_relation_user_alertgroup rel where u.id = rel.user_id AND u.user_type = 1 AND rel.alertgroup_id = #{alertgroupId} - SELECT u.*,t.tenant_code FROM t_escheduler_user u, t_escheduler_tenant t WHERE u.tenant_id = t.id AND u.id = #{userId} - select u.* from t_escheduler_user u ,t_escheduler_access_token t where u.id = t.user_id and token=#{token} and t.expire_time > NOW() diff --git a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml similarity index 60% rename from escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml rename to dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml index 9b82e15cc7..0bc7b3a891 100644 --- a/escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/WorkerGroupMapper.xml @@ -1,17 +1,17 @@ - - select * from t_escheduler_worker_group order by update_time desc - select * from t_escheduler_worker_group where `name` = #{name} - select * from t_escheduler_worker_group where 1 = 1 diff --git a/escheduler-dao/src/main/resources/dao/data_source.properties__ b/dolphinscheduler-dao/src/main/resources/dao/data_source.properties__ similarity index 100% rename from escheduler-dao/src/main/resources/dao/data_source.properties__ rename to dolphinscheduler-dao/src/main/resources/dao/data_source.properties__ diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/cron/CronUtilsTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java similarity index 98% rename from escheduler-dao/src/test/java/cn/escheduler/dao/cron/CronUtilsTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java index b9fad850e4..86227e348f 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/cron/CronUtilsTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/cron/CronUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.cron; +package org.apache.dolphinscheduler.dao.cron; -import cn.escheduler.common.enums.CycleEnum; -import cn.escheduler.dao.utils.cron.CronUtils; +import org.apache.dolphinscheduler.common.enums.CycleEnum; +import org.apache.dolphinscheduler.dao.utils.cron.CronUtils; import com.cronutils.builder.CronBuilder; import com.cronutils.model.Cron; import com.cronutils.model.CronType; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java index 078288b5a6..caa96dfde1 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AccessTokenMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AccessTokenMapperTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.AccessToken; +import org.apache.dolphinscheduler.dao.entity.AccessToken; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapperTest.java similarity index 95% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertGroupMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapperTest.java index 9f95ce3b70..e76de96035 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertGroupMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertGroupMapperTest.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.dao.entity.AccessToken; -import cn.escheduler.dao.entity.AlertGroup; -import cn.escheduler.dao.entity.UserAlertGroup; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.dao.entity.AlertGroup; +import org.apache.dolphinscheduler.dao.entity.UserAlertGroup; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java similarity index 94% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java index c1a0344c6b..becf68017e 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/AlertMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AlertMapperTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.AlertStatus; -import cn.escheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.common.enums.AlertStatus; +import org.apache.dolphinscheduler.dao.entity.Alert; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/CommandMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java similarity index 94% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/CommandMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java index 625273fa27..2681183709 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/CommandMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/CommandMapperTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.*; -import cn.escheduler.dao.entity.Command; -import cn.escheduler.dao.entity.CommandCount; -import cn.escheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.Command; +import org.apache.dolphinscheduler.dao.entity.CommandCount; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.common.enums.*; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java similarity index 95% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java index 9ec9f6f513..1aeccaadf4 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceMapperTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.DbType; -import cn.escheduler.dao.entity.DataSource; -import cn.escheduler.dao.entity.DatasourceUser; +import org.apache.dolphinscheduler.common.enums.DbType; +import org.apache.dolphinscheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.dao.entity.DatasourceUser; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceUserMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java index e18854b254..42a024c32c 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/DataSourceUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/DataSourceUserMapperTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.DatasourceUser; +import org.apache.dolphinscheduler.dao.entity.DatasourceUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ErrorCommandMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java similarity index 92% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ErrorCommandMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java index 9bd9aba125..477ff2d68f 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ErrorCommandMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapperTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.dao.entity.CommandCount; -import cn.escheduler.dao.entity.ErrorCommand; -import cn.escheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.dao.entity.CommandCount; +import org.apache.dolphinscheduler.dao.entity.ErrorCommand; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java similarity index 97% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java index 221adde707..e7c1e55011 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java @@ -14,15 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.dao.entity.*; +import org.apache.dolphinscheduler.common.enums.UserType; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.dao.entity.*; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java index cb3b5d0623..40ff56c562 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapMapperTest.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstanceMap; +import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -26,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import java.util.Date; import java.util.List; @RunWith(SpringRunner.class) diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java similarity index 95% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java index 2c5da78d43..626a774961 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java @@ -14,19 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.Flag; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.dao.entity.*; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.Flag; +import org.apache.dolphinscheduler.common.enums.ReleaseState; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.Project; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.mortbay.jetty.servlet.AbstractSessionIdManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java index cf23e8101c..00ef3aa8c8 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java similarity index 94% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java index a1b201c7e1..89b11c794b 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectUserMapperTest.java @@ -14,12 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.dao.entity.ProjectUser; -import cn.escheduler.dao.entity.ProjectUser; +import org.apache.dolphinscheduler.dao.entity.ProjectUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java index 9ab0e1ce43..1539d4ce96 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/QueueMapperTest.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Queue; -import cn.escheduler.dao.entity.Queue; +import org.apache.dolphinscheduler.dao.entity.Queue; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java index 34c0e26918..278195fe46 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java index a492a86913..12f9b4b31f 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ResourceUserMapperTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.ResourcesUser; +import org.apache.dolphinscheduler.dao.entity.ResourcesUser; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java similarity index 93% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java index 8483b6bd62..b3ce4c4fce 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.FailureStrategy; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.common.enums.WarningType; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.Project; -import cn.escheduler.dao.entity.Schedule; -import cn.escheduler.dao.entity.User; +import org.apache.dolphinscheduler.common.enums.FailureStrategy; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.Schedule; +import org.apache.dolphinscheduler.dao.entity.User; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java index aa81544030..ca16ee07d4 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/SessionMapperTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Session; +import org.apache.dolphinscheduler.dao.entity.Session; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TaskInstanceMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java similarity index 97% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TaskInstanceMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java index b227c1194e..591a5b2e9b 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TaskInstanceMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java similarity index 95% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java index 56c1b2b57e..917b3d2461 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TenantMapperTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.Queue; -import cn.escheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.dao.entity.Queue; +import org.apache.dolphinscheduler.dao.entity.Tenant; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UDFUserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java similarity index 95% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UDFUserMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java index a49a5913f3..3e9671c10d 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UDFUserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UDFUserMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UdfFuncMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UdfFuncMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java index 795c899c42..001f1f510b 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UdfFuncMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserAlertGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java similarity index 96% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserAlertGroupMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java index 3a11a432b4..3e86eab0e2 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserAlertGroupMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserAlertGroupMapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; import org.junit.Test; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java similarity index 97% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java index 92721682a8..d344308579 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/UserMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/UserMapperTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.enums.UserType; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.dao.entity.*; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.UserType; +import org.apache.dolphinscheduler.common.utils.DateUtils; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.dolphinscheduler.dao.entity.*; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java similarity index 97% rename from escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java rename to dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java index ff215e625b..910a785fd5 100644 --- a/escheduler-dao/src/test/java/cn/escheduler/dao/mapper/WorkerGroupMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/WorkerGroupMapperTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.dao.mapper; +package org.apache.dolphinscheduler.dao.mapper; -import cn.escheduler.dao.entity.WorkerGroup; +import org.apache.dolphinscheduler.dao.entity.WorkerGroup; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.junit.Assert; diff --git a/escheduler-dao/src/test/resources/dao/data_source.properties b/dolphinscheduler-dao/src/test/resources/dao/data_source.properties similarity index 100% rename from escheduler-dao/src/test/resources/dao/data_source.properties rename to dolphinscheduler-dao/src/test/resources/dao/data_source.properties diff --git a/escheduler-rpc/pom.xml b/dolphinscheduler-rpc/pom.xml similarity index 94% rename from escheduler-rpc/pom.xml rename to dolphinscheduler-rpc/pom.xml index e3d7c91a92..30567310be 100644 --- a/escheduler-rpc/pom.xml +++ b/dolphinscheduler-rpc/pom.xml @@ -2,16 +2,16 @@ - escheduler - cn.analysys + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT 4.0.0 - escheduler-rpc + dolphinscheduler-rpc - escheduler-rpc - https://github.com/analysys/EasyScheduler + dolphinscheduler-rpc + https://github.com/apache/incubator-dolphinscheduler UTF-8 diff --git a/escheduler-rpc/src/main/java/cn/escheduler/rpc/LogViewServiceGrpc.java b/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java similarity index 69% rename from escheduler-rpc/src/main/java/cn/escheduler/rpc/LogViewServiceGrpc.java rename to dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java index 8723eef842..4ea4646118 100644 --- a/escheduler-rpc/src/main/java/cn/escheduler/rpc/LogViewServiceGrpc.java +++ b/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java @@ -1,4 +1,4 @@ -package cn.escheduler.rpc; +package org.apache.dolphinscheduler.rpc; import static io.grpc.MethodDescriptor.generateFullMethodName; import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; @@ -33,29 +33,29 @@ public final class LogViewServiceGrpc { // Static method descriptors that strictly reflect the proto. @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") @java.lang.Deprecated // Use {@link #getRollViewLogMethod()} instead. - public static final io.grpc.MethodDescriptor METHOD_ROLL_VIEW_LOG = getRollViewLogMethod(); + public static final io.grpc.MethodDescriptor METHOD_ROLL_VIEW_LOG = getRollViewLogMethod(); - private static volatile io.grpc.MethodDescriptor getRollViewLogMethod; + private static volatile io.grpc.MethodDescriptor getRollViewLogMethod; @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - public static io.grpc.MethodDescriptor getRollViewLogMethod() { - io.grpc.MethodDescriptor getRollViewLogMethod; + public static io.grpc.MethodDescriptor getRollViewLogMethod() { + io.grpc.MethodDescriptor getRollViewLogMethod; if ((getRollViewLogMethod = LogViewServiceGrpc.getRollViewLogMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getRollViewLogMethod = LogViewServiceGrpc.getRollViewLogMethod) == null) { LogViewServiceGrpc.getRollViewLogMethod = getRollViewLogMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( "schduler.LogViewService", "rollViewLog")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.LogParameter.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.LogParameter.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.RetStrInfo.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.RetStrInfo.getDefaultInstance())) .setSchemaDescriptor(new LogViewServiceMethodDescriptorSupplier("rollViewLog")) .build(); } @@ -65,29 +65,29 @@ public final class LogViewServiceGrpc { } @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") @java.lang.Deprecated // Use {@link #getViewLogMethod()} instead. - public static final io.grpc.MethodDescriptor METHOD_VIEW_LOG = getViewLogMethod(); + public static final io.grpc.MethodDescriptor METHOD_VIEW_LOG = getViewLogMethod(); - private static volatile io.grpc.MethodDescriptor getViewLogMethod; + private static volatile io.grpc.MethodDescriptor getViewLogMethod; @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - public static io.grpc.MethodDescriptor getViewLogMethod() { - io.grpc.MethodDescriptor getViewLogMethod; + public static io.grpc.MethodDescriptor getViewLogMethod() { + io.grpc.MethodDescriptor getViewLogMethod; if ((getViewLogMethod = LogViewServiceGrpc.getViewLogMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getViewLogMethod = LogViewServiceGrpc.getViewLogMethod) == null) { LogViewServiceGrpc.getViewLogMethod = getViewLogMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( "schduler.LogViewService", "viewLog")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.PathParameter.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.PathParameter.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.RetStrInfo.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.RetStrInfo.getDefaultInstance())) .setSchemaDescriptor(new LogViewServiceMethodDescriptorSupplier("viewLog")) .build(); } @@ -97,29 +97,29 @@ public final class LogViewServiceGrpc { } @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") @java.lang.Deprecated // Use {@link #getGetLogBytesMethod()} instead. - public static final io.grpc.MethodDescriptor METHOD_GET_LOG_BYTES = getGetLogBytesMethod(); + public static final io.grpc.MethodDescriptor METHOD_GET_LOG_BYTES = getGetLogBytesMethod(); - private static volatile io.grpc.MethodDescriptor getGetLogBytesMethod; + private static volatile io.grpc.MethodDescriptor getGetLogBytesMethod; @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - public static io.grpc.MethodDescriptor getGetLogBytesMethod() { - io.grpc.MethodDescriptor getGetLogBytesMethod; + public static io.grpc.MethodDescriptor getGetLogBytesMethod() { + io.grpc.MethodDescriptor getGetLogBytesMethod; if ((getGetLogBytesMethod = LogViewServiceGrpc.getGetLogBytesMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getGetLogBytesMethod = LogViewServiceGrpc.getGetLogBytesMethod) == null) { LogViewServiceGrpc.getGetLogBytesMethod = getGetLogBytesMethod = - io.grpc.MethodDescriptor.newBuilder() + io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( "schduler.LogViewService", "getLogBytes")) .setSampledToLocalTracing(true) .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.PathParameter.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.PathParameter.getDefaultInstance())) .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( - cn.escheduler.rpc.RetByteInfo.getDefaultInstance())) + org.apache.dolphinscheduler.rpc.RetByteInfo.getDefaultInstance())) .setSchemaDescriptor(new LogViewServiceMethodDescriptorSupplier("getLogBytes")) .build(); } @@ -165,8 +165,8 @@ public final class LogViewServiceGrpc { * roll view log * */ - public void rollViewLog(cn.escheduler.rpc.LogParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void rollViewLog(org.apache.dolphinscheduler.rpc.LogParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnimplementedUnaryCall(getRollViewLogMethod(), responseObserver); } @@ -176,8 +176,8 @@ public final class LogViewServiceGrpc { * view all log * */ - public void viewLog(cn.escheduler.rpc.PathParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void viewLog(org.apache.dolphinscheduler.rpc.PathParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnimplementedUnaryCall(getViewLogMethod(), responseObserver); } @@ -187,8 +187,8 @@ public final class LogViewServiceGrpc { * get log bytes * */ - public void getLogBytes(cn.escheduler.rpc.PathParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void getLogBytes(org.apache.dolphinscheduler.rpc.PathParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnimplementedUnaryCall(getGetLogBytesMethod(), responseObserver); } @@ -198,22 +198,22 @@ public final class LogViewServiceGrpc { getRollViewLogMethod(), asyncUnaryCall( new MethodHandlers< - cn.escheduler.rpc.LogParameter, - cn.escheduler.rpc.RetStrInfo>( + org.apache.dolphinscheduler.rpc.LogParameter, + org.apache.dolphinscheduler.rpc.RetStrInfo>( this, METHODID_ROLL_VIEW_LOG))) .addMethod( getViewLogMethod(), asyncUnaryCall( new MethodHandlers< - cn.escheduler.rpc.PathParameter, - cn.escheduler.rpc.RetStrInfo>( + org.apache.dolphinscheduler.rpc.PathParameter, + org.apache.dolphinscheduler.rpc.RetStrInfo>( this, METHODID_VIEW_LOG))) .addMethod( getGetLogBytesMethod(), asyncUnaryCall( new MethodHandlers< - cn.escheduler.rpc.PathParameter, - cn.escheduler.rpc.RetByteInfo>( + org.apache.dolphinscheduler.rpc.PathParameter, + org.apache.dolphinscheduler.rpc.RetByteInfo>( this, METHODID_GET_LOG_BYTES))) .build(); } @@ -247,8 +247,8 @@ public final class LogViewServiceGrpc { * roll view log * */ - public void rollViewLog(cn.escheduler.rpc.LogParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void rollViewLog(org.apache.dolphinscheduler.rpc.LogParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( getChannel().newCall(getRollViewLogMethod(), getCallOptions()), request, responseObserver); } @@ -259,8 +259,8 @@ public final class LogViewServiceGrpc { * view all log * */ - public void viewLog(cn.escheduler.rpc.PathParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void viewLog(org.apache.dolphinscheduler.rpc.PathParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( getChannel().newCall(getViewLogMethod(), getCallOptions()), request, responseObserver); } @@ -271,8 +271,8 @@ public final class LogViewServiceGrpc { * get log bytes * */ - public void getLogBytes(cn.escheduler.rpc.PathParameter request, - io.grpc.stub.StreamObserver responseObserver) { + public void getLogBytes(org.apache.dolphinscheduler.rpc.PathParameter request, + io.grpc.stub.StreamObserver responseObserver) { asyncUnaryCall( getChannel().newCall(getGetLogBytesMethod(), getCallOptions()), request, responseObserver); } @@ -306,7 +306,7 @@ public final class LogViewServiceGrpc { * roll view log * */ - public cn.escheduler.rpc.RetStrInfo rollViewLog(cn.escheduler.rpc.LogParameter request) { + public org.apache.dolphinscheduler.rpc.RetStrInfo rollViewLog(org.apache.dolphinscheduler.rpc.LogParameter request) { return blockingUnaryCall( getChannel(), getRollViewLogMethod(), getCallOptions(), request); } @@ -317,7 +317,7 @@ public final class LogViewServiceGrpc { * view all log * */ - public cn.escheduler.rpc.RetStrInfo viewLog(cn.escheduler.rpc.PathParameter request) { + public org.apache.dolphinscheduler.rpc.RetStrInfo viewLog(org.apache.dolphinscheduler.rpc.PathParameter request) { return blockingUnaryCall( getChannel(), getViewLogMethod(), getCallOptions(), request); } @@ -328,7 +328,7 @@ public final class LogViewServiceGrpc { * get log bytes * */ - public cn.escheduler.rpc.RetByteInfo getLogBytes(cn.escheduler.rpc.PathParameter request) { + public org.apache.dolphinscheduler.rpc.RetByteInfo getLogBytes(org.apache.dolphinscheduler.rpc.PathParameter request) { return blockingUnaryCall( getChannel(), getGetLogBytesMethod(), getCallOptions(), request); } @@ -362,8 +362,8 @@ public final class LogViewServiceGrpc { * roll view log * */ - public com.google.common.util.concurrent.ListenableFuture rollViewLog( - cn.escheduler.rpc.LogParameter request) { + public com.google.common.util.concurrent.ListenableFuture rollViewLog( + org.apache.dolphinscheduler.rpc.LogParameter request) { return futureUnaryCall( getChannel().newCall(getRollViewLogMethod(), getCallOptions()), request); } @@ -374,8 +374,8 @@ public final class LogViewServiceGrpc { * view all log * */ - public com.google.common.util.concurrent.ListenableFuture viewLog( - cn.escheduler.rpc.PathParameter request) { + public com.google.common.util.concurrent.ListenableFuture viewLog( + org.apache.dolphinscheduler.rpc.PathParameter request) { return futureUnaryCall( getChannel().newCall(getViewLogMethod(), getCallOptions()), request); } @@ -386,8 +386,8 @@ public final class LogViewServiceGrpc { * get log bytes * */ - public com.google.common.util.concurrent.ListenableFuture getLogBytes( - cn.escheduler.rpc.PathParameter request) { + public com.google.common.util.concurrent.ListenableFuture getLogBytes( + org.apache.dolphinscheduler.rpc.PathParameter request) { return futureUnaryCall( getChannel().newCall(getGetLogBytesMethod(), getCallOptions()), request); } @@ -415,16 +415,16 @@ public final class LogViewServiceGrpc { public void invoke(Req request, io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { case METHODID_ROLL_VIEW_LOG: - serviceImpl.rollViewLog((cn.escheduler.rpc.LogParameter) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.rollViewLog((org.apache.dolphinscheduler.rpc.LogParameter) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_VIEW_LOG: - serviceImpl.viewLog((cn.escheduler.rpc.PathParameter) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.viewLog((org.apache.dolphinscheduler.rpc.PathParameter) request, + (io.grpc.stub.StreamObserver) responseObserver); break; case METHODID_GET_LOG_BYTES: - serviceImpl.getLogBytes((cn.escheduler.rpc.PathParameter) request, - (io.grpc.stub.StreamObserver) responseObserver); + serviceImpl.getLogBytes((org.apache.dolphinscheduler.rpc.PathParameter) request, + (io.grpc.stub.StreamObserver) responseObserver); break; default: throw new AssertionError(); @@ -448,7 +448,7 @@ public final class LogViewServiceGrpc { @java.lang.Override public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() { - return cn.escheduler.rpc.SchdulerProto.getDescriptor(); + return org.apache.dolphinscheduler.rpc.SchdulerProto.getDescriptor(); } @java.lang.Override diff --git a/escheduler-rpc/src/main/proto/scheduler.proto b/dolphinscheduler-rpc/src/main/proto/scheduler.proto similarity index 94% rename from escheduler-rpc/src/main/proto/scheduler.proto rename to dolphinscheduler-rpc/src/main/proto/scheduler.proto index 7f1129740d..e1c5664b07 100644 --- a/escheduler-rpc/src/main/proto/scheduler.proto +++ b/dolphinscheduler-rpc/src/main/proto/scheduler.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package schduler; option java_multiple_files = true; -option java_package = "cn.escheduler.rpc"; +option java_package = "org.apache.dolphinscheduler.rpc"; option java_outer_classname = "SchdulerProto"; diff --git a/escheduler-server/pom.xml b/dolphinscheduler-server/pom.xml similarity index 83% rename from escheduler-server/pom.xml rename to dolphinscheduler-server/pom.xml index 7f149278c8..36906f0cf2 100644 --- a/escheduler-server/pom.xml +++ b/dolphinscheduler-server/pom.xml @@ -1,12 +1,12 @@ 4.0.0 - escheduler - cn.analysys + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT - escheduler-server - escheduler-server + dolphinscheduler-server + dolphinscheduler-server http://maven.apache.org jar @@ -15,8 +15,8 @@ - cn.analysys - escheduler-common + org.apache.dolphinscheduler + dolphinscheduler-common protobuf-java @@ -41,8 +41,8 @@ - cn.analysys - escheduler-dao + org.apache.dolphinscheduler + dolphinscheduler-dao spring-boot-starter-logging @@ -52,8 +52,8 @@ - cn.analysys - escheduler-rpc + org.apache.dolphinscheduler + dolphinscheduler-rpc org.apache.curator @@ -85,8 +85,8 @@ - cn.analysys - escheduler-alert + org.apache.dolphinscheduler + dolphinscheduler-alert diff --git a/escheduler-server/src/main/assembly/package.xml b/dolphinscheduler-server/src/main/assembly/package.xml similarity index 80% rename from escheduler-server/src/main/assembly/package.xml rename to dolphinscheduler-server/src/main/assembly/package.xml index 7a8188c05b..7b4f5fd583 100644 --- a/escheduler-server/src/main/assembly/package.xml +++ b/dolphinscheduler-server/src/main/assembly/package.xml @@ -18,7 +18,7 @@ conf - ${project.parent.basedir}/escheduler-common/src/main/resources + ${project.parent.basedir}/dolphinscheduler-common/src/main/resources **/*.properties **/*.xml @@ -27,7 +27,7 @@ conf - ${project.parent.basedir}/escheduler-common/src/main/resources/bin + ${project.parent.basedir}/dolphinscheduler-common/src/main/resources/bin *.* @@ -35,7 +35,7 @@ bin - ${project.parent.basedir}/escheduler-dao/src/main/resources + ${project.parent.basedir}/dolphinscheduler-dao/src/main/resources **/*.properties **/*.xml @@ -44,7 +44,7 @@ conf - ${project.parent.basedir}/escheduler-api/src/main/resources + ${project.parent.basedir}/dolphinscheduler-api/src/main/resources **/*.properties **/*.xml @@ -55,7 +55,7 @@ target/ - escheduler-server-${project.version}.jar + dolphinscheduler-server-${project.version}.jar lib diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/AbstractServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java similarity index 95% rename from escheduler-server/src/main/java/cn/escheduler/server/master/AbstractServer.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java index a3db90b010..60948ad1b6 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/AbstractServer.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/AbstractServer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master; +package org.apache.dolphinscheduler.server.master; -import cn.escheduler.common.IStoppable; +import org.apache.dolphinscheduler.common.IStoppable; import org.apache.commons.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/MasterServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java similarity index 92% rename from escheduler-server/src/main/java/cn/escheduler/server/master/MasterServer.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java index d68b181660..45ca9f625f 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/MasterServer.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master; +package org.apache.dolphinscheduler.server.master; -import cn.escheduler.common.Constants; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.thread.ThreadPoolExecutors; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.server.master.runner.MasterSchedulerThread; -import cn.escheduler.server.quartz.ProcessScheduleJob; -import cn.escheduler.server.quartz.QuartzExecutors; -import cn.escheduler.server.zk.ZKMasterClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.server.master.runner.MasterSchedulerThread; +import org.apache.dolphinscheduler.server.quartz.ProcessScheduleJob; +import org.apache.dolphinscheduler.server.quartz.QuartzExecutors; +import org.apache.dolphinscheduler.server.zk.ZKMasterClient; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.lang3.StringUtils; @@ -34,8 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.ComponentScan; import java.util.concurrent.ExecutorService; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/log/MasterLogFilter.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/master/log/MasterLogFilter.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java index fdacd6d7fe..6f2ccf291d 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/log/MasterLogFilter.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/log/MasterLogFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.log; +package org.apache.dolphinscheduler.server.master.log; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterBaseTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java similarity index 87% rename from escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterBaseTaskExecThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java index b323b3ee99..9e856b39cd 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterBaseTaskExecThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.runner; +package org.apache.dolphinscheduler.server.master.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.utils.BeanContext; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.utils.BeanContext; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java index 613d9b12c6..3e7c3a7108 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterExecThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.runner; +package org.apache.dolphinscheduler.server.master.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.*; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.ProcessDag; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.*; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.utils.DagHelper; -import cn.escheduler.server.utils.AlertManager; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.*; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.ProcessDag; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.utils.DagHelper; +import org.apache.dolphinscheduler.server.utils.AlertManager; import com.alibaba.fastjson.JSONObject; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.dolphinscheduler.common.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,7 +47,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import static cn.escheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.Constants.*; /** * master exec thread,split dag @@ -223,7 +223,7 @@ public class MasterExecThread implements Runnable { processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processInstance.getProcessDefinition().getGlobalParamMap(), processInstance.getProcessDefinition().getGlobalParamList(), - CommandType.COMPLEMENT_DATA,processInstance.getScheduleTime())); + CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime())); processDao.saveProcessInstance(processInstance); } @@ -311,7 +311,7 @@ public class MasterExecThread implements Runnable { if (!CommonUtils.isDevelopMode()) { // get exec dir - String execLocalPath = cn.escheduler.common.utils.FileUtils + String execLocalPath = org.apache.dolphinscheduler.common.utils.FileUtils .getProcessExecDir(processInstance.getProcessDefinition().getProjectId(), processInstance.getProcessDefinitionId(), processInstance.getId()); diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterSchedulerThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java similarity index 87% rename from escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterSchedulerThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java index e886c7a2da..cbc215fd62 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterSchedulerThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.runner; +package org.apache.dolphinscheduler.server.master.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.common.zk.AbstractZKClient; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.server.zk.ZKMasterClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.server.zk.ZKMasterClient; import org.apache.commons.configuration.Configuration; import org.apache.curator.framework.imps.CuratorFrameworkState; import org.apache.curator.framework.recipes.locks.InterProcessMutex; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java similarity index 89% rename from escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterTaskExecThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java index 1713cda59f..cb794ab7dc 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/MasterTaskExecThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.runner; +package org.apache.dolphinscheduler.server.master.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.TaskTimeoutStrategy; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.task.TaskTimeoutParameter; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Date; -import static cn.escheduler.common.Constants.SCHEDULER_TASKS_KILL; +import static org.apache.dolphinscheduler.common.Constants.SCHEDULER_TASKS_KILL; /** * master task exec thread diff --git a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/SubProcessTaskExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java similarity index 94% rename from escheduler-server/src/main/java/cn/escheduler/server/master/runner/SubProcessTaskExecThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java index efcd308cb2..7f0737a463 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/master/runner/SubProcessTaskExecThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master.runner; +package org.apache.dolphinscheduler.server.master.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/quartz/DruidConnectionProvider.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java similarity index 99% rename from escheduler-server/src/main/java/cn/escheduler/server/quartz/DruidConnectionProvider.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java index b58d87ce9d..c328596761 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/quartz/DruidConnectionProvider.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/DruidConnectionProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.quartz; +package org.apache.dolphinscheduler.server.quartz; import com.alibaba.druid.pool.DruidDataSource; import org.quartz.SchedulerException; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java similarity index 88% rename from escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java index 49c0d9bd32..828a54d7b8 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/quartz/ProcessScheduleJob.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/ProcessScheduleJob.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.quartz; +package org.apache.dolphinscheduler.server.quartz; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.ReleaseState; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.Command; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.Schedule; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.ReleaseState; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.Command; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.Schedule; import org.quartz.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,9 +31,6 @@ import org.springframework.util.Assert; import java.util.Date; -import static cn.escheduler.server.quartz.QuartzExecutors.buildJobGroupName; -import static cn.escheduler.server.quartz.QuartzExecutors.buildJobName; - /** * process schedule job *

@@ -131,8 +128,8 @@ public class ProcessScheduleJob implements Job { * delete job */ private void deleteJob(int projectId, int scheduleId) { - String jobName = buildJobName(scheduleId); - String jobGroupName = buildJobGroupName(projectId); + String jobName = QuartzExecutors.buildJobName(scheduleId); + String jobGroupName = QuartzExecutors.buildJobGroupName(projectId); QuartzExecutors.getInstance().deleteJob(jobName, jobGroupName); } } diff --git a/escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java similarity index 97% rename from escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java index 5c610e759d..8e22ead291 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/quartz/QuartzExecutors.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/quartz/QuartzExecutors.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.quartz; +package org.apache.dolphinscheduler.server.quartz; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.entity.Schedule; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.entity.Schedule; import org.apache.commons.lang.StringUtils; import org.quartz.*; import org.quartz.impl.StdSchedulerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LogClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LogClient.java similarity index 97% rename from escheduler-server/src/main/java/cn/escheduler/server/rpc/LogClient.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LogClient.java index 745bd323bf..6bb1a14a7c 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LogClient.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LogClient.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.rpc; +package org.apache.dolphinscheduler.server.rpc; -import cn.escheduler.rpc.*; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.StatusRuntimeException; +import org.apache.dolphinscheduler.rpc.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java similarity index 98% rename from escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java index 1dde113545..ace34a2eeb 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/rpc/LoggerServer.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/rpc/LoggerServer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.rpc; +package org.apache.dolphinscheduler.server.rpc; -import cn.escheduler.common.Constants; -import cn.escheduler.rpc.*; +import io.grpc.stub.StreamObserver; +import org.apache.dolphinscheduler.common.Constants; import com.google.protobuf.ByteString; import io.grpc.Server; import io.grpc.ServerBuilder; -import io.grpc.stub.StreamObserver; +import org.apache.dolphinscheduler.rpc.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java similarity index 92% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java index d0de7a30ca..3a79f7073d 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/AlertManager.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.enums.AlertType; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.ShowType; -import cn.escheduler.common.enums.WarningType; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.entity.Alert; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.common.enums.AlertType; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.entity.Alert; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java similarity index 93% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java index 308103073d..daa6ca97ef 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/FlinkArgsUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/FlinkArgsUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.task.flink.FlinkParameters; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.task.flink.FlinkParameters; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java index a4207d3793..a4985f2c9b 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/LoggerUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/LoggerUtils.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.Constants; +import org.apache.dolphinscheduler.common.Constants; import org.slf4j.Logger; import java.util.ArrayList; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/ParamUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ParamUtils.java similarity index 92% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/ParamUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ParamUtils.java index b16e9f3092..a326977729 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/ParamUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ParamUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; import java.util.Date; import java.util.HashMap; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/ProcessUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/ProcessUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java index ff24616300..bcfb1f2dad 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/ProcessUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/ProcessUtils.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.CommonUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.rpc.LogClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.rpc.LogClient; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/SparkArgsUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SparkArgsUtils.java similarity index 93% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/SparkArgsUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SparkArgsUtils.java index b12c6ecef4..3d57330d57 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/SparkArgsUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/SparkArgsUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.task.spark.SparkParameters; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.task.spark.SparkParameters; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/utils/UDFUtils.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java similarity index 91% rename from escheduler-server/src/main/java/cn/escheduler/server/utils/UDFUtils.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java index 212ae0168d..99f07da25f 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/utils/UDFUtils.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/UDFUtils.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.utils; +package org.apache.dolphinscheduler.server.utils; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.dao.entity.UdfFunc; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.dao.entity.UdfFunc; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -28,7 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static cn.escheduler.common.utils.CollectionUtils.isNotEmpty; +import static org.apache.dolphinscheduler.common.utils.CollectionUtils.isNotEmpty; /** * udf utils diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/WorkerServer.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java similarity index 90% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/WorkerServer.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java index 13ee800312..ed3b2d66d0 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/WorkerServer.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker; +package org.apache.dolphinscheduler.server.worker; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.queue.TaskQueueFactory; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.thread.ThreadPoolExecutors; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.master.AbstractServer; -import cn.escheduler.server.utils.ProcessUtils; -import cn.escheduler.server.worker.runner.FetchTaskThread; -import cn.escheduler.server.zk.ZKWorkerClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.queue.TaskQueueFactory; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.master.AbstractServer; +import org.apache.dolphinscheduler.server.utils.ProcessUtils; +import org.apache.dolphinscheduler.server.worker.runner.FetchTaskThread; +import org.apache.dolphinscheduler.server.zk.ZKWorkerClient; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.commons.lang.StringUtils; @@ -40,8 +40,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.annotation.ComponentScan; import java.util.Set; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogDiscriminator.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java similarity index 92% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogDiscriminator.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java index 91852725d3..a7941a8824 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogDiscriminator.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogDiscriminator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.log; +package org.apache.dolphinscheduler.server.worker.log; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.sift.AbstractDiscriminator; -import cn.escheduler.common.Constants; -import cn.escheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; public class TaskLogDiscriminator extends AbstractDiscriminator { diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogFilter.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java similarity index 91% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogFilter.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java index bb93f52cd5..c704a88520 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/TaskLogFilter.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/TaskLogFilter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.log; +package org.apache.dolphinscheduler.server.worker.log; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.FilterReply; -import cn.escheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; /** * task log filter diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/WorkerLogFilter.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/log/WorkerLogFilter.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java index ca8ea3fc64..e666b3ac2f 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/log/WorkerLogFilter.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/log/WorkerLogFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.log; +package org.apache.dolphinscheduler.server.worker.log; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java similarity index 92% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java index ca7501465d..4dfc6fb513 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/FetchTaskThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/FetchTaskThread.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.runner; +package org.apache.dolphinscheduler.server.worker.runner; -import cn.escheduler.common.Constants; -import cn.escheduler.common.queue.ITaskQueue; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.FileUtils; -import cn.escheduler.common.utils.OSUtils; -import cn.escheduler.common.zk.AbstractZKClient; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.entity.Tenant; -import cn.escheduler.dao.entity.WorkerGroup; -import cn.escheduler.server.zk.ZKWorkerClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.queue.ITaskQueue; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.FileUtils; +import org.apache.dolphinscheduler.common.utils.OSUtils; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.dao.entity.WorkerGroup; +import org.apache.dolphinscheduler.server.zk.ZKWorkerClient; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang3.StringUtils; import org.apache.curator.framework.recipes.locks.InterProcessMutex; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java similarity index 89% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java index fff74cd949..91da0b6d1c 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/runner/TaskScheduleThread.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskScheduleThread.java @@ -14,30 +14,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.runner; +package org.apache.dolphinscheduler.server.worker.runner; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.sift.SiftingAppender; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.TaskTimeoutParameter; -import cn.escheduler.common.utils.*; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.entity.Tenant; -import cn.escheduler.server.utils.LoggerUtils; -import cn.escheduler.server.worker.log.TaskLogDiscriminator; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskManager; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.entity.Tenant; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.server.worker.log.TaskLogDiscriminator; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskManager; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONObject; +import org.apache.dolphinscheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.common.utils.TaskParametersUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -312,7 +314,7 @@ public class TaskScheduleThread implements Runnable { try { // query the tenant code of the resource according to the name of the resource String tentnCode = processDao.queryTenantCodeByResName(res); - String resHdfsPath = HadoopUtils.getHdfsFilename(tentnCode,res); + String resHdfsPath = HadoopUtils.getHdfsFilename(tentnCode, res); logger.info("get resource file from hdfs :{}", resHdfsPath); HadoopUtils.getInstance().copyHdfsToLocal(resHdfsPath, execLocalPath + File.separator + res, false, true); diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java index a3349fd93d..5fdf61d76f 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.thread.ThreadUtils; -import cn.escheduler.common.utils.HadoopUtils; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.utils.LoggerUtils; -import cn.escheduler.server.utils.ProcessUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.thread.ThreadUtils; +import org.apache.dolphinscheduler.common.utils.HadoopUtils; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.server.utils.ProcessUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java similarity index 84% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java index 6472873d8b..534bf40301 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractTask.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.TaskRecordStatus; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.flink.FlinkParameters; -import cn.escheduler.common.task.mr.MapreduceParameters; -import cn.escheduler.common.task.procedure.ProcedureParameters; -import cn.escheduler.common.task.python.PythonParameters; -import cn.escheduler.common.task.shell.ShellParameters; -import cn.escheduler.common.task.spark.SparkParameters; -import cn.escheduler.common.task.sql.SqlParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.TaskRecordDao; -import cn.escheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.TaskRecordStatus; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.flink.FlinkParameters; +import org.apache.dolphinscheduler.common.task.mr.MapreduceParameters; +import org.apache.dolphinscheduler.common.task.procedure.ProcedureParameters; +import org.apache.dolphinscheduler.common.task.python.PythonParameters; +import org.apache.dolphinscheduler.common.task.shell.ShellParameters; +import org.apache.dolphinscheduler.common.task.spark.SparkParameters; +import org.apache.dolphinscheduler.common.task.sql.SqlParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.TaskRecordDao; +import org.apache.dolphinscheduler.server.utils.ParamUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractYarnTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java similarity index 89% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractYarnTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java index 84d220a937..7af1af5318 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/AbstractYarnTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractYarnTask.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.utils.ProcessUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.utils.ProcessUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/PythonCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java similarity index 96% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/PythonCommandExecutor.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java index 6ea70f96f5..af4b3512f3 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/PythonCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.common.Constants; -import cn.escheduler.common.utils.FileUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.utils.FileUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/ShellCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java similarity index 98% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/ShellCommandExecutor.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java index d826fee9ca..0b7493b59e 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/ShellCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskManager.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java similarity index 72% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskManager.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java index de96ff25be..e308a906a6 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskManager.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskManager.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.common.enums.TaskType; -import cn.escheduler.server.worker.task.dependent.DependentTask; -import cn.escheduler.server.worker.task.flink.FlinkTask; -import cn.escheduler.server.worker.task.http.HttpTask; -import cn.escheduler.server.worker.task.mr.MapReduceTask; -import cn.escheduler.server.worker.task.processdure.ProcedureTask; -import cn.escheduler.server.worker.task.python.PythonTask; -import cn.escheduler.server.worker.task.shell.ShellTask; -import cn.escheduler.server.worker.task.spark.SparkTask; -import cn.escheduler.server.worker.task.sql.SqlTask; +import org.apache.dolphinscheduler.common.enums.TaskType; +import org.apache.dolphinscheduler.server.worker.task.dependent.DependentTask; +import org.apache.dolphinscheduler.server.worker.task.flink.FlinkTask; +import org.apache.dolphinscheduler.server.worker.task.http.HttpTask; +import org.apache.dolphinscheduler.server.worker.task.mr.MapReduceTask; +import org.apache.dolphinscheduler.server.worker.task.processdure.ProcedureTask; +import org.apache.dolphinscheduler.server.worker.task.python.PythonTask; +import org.apache.dolphinscheduler.server.worker.task.shell.ShellTask; +import org.apache.dolphinscheduler.server.worker.task.spark.SparkTask; +import org.apache.dolphinscheduler.server.worker.task.sql.SqlTask; import org.apache.commons.lang3.EnumUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskProps.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskProps.java similarity index 94% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskProps.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskProps.java index 0db35e8d0a..340f35d0be 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/TaskProps.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/TaskProps.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task; +package org.apache.dolphinscheduler.server.worker.task; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.enums.Direct; -import cn.escheduler.common.enums.TaskTimeoutStrategy; -import cn.escheduler.common.process.Property; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.enums.Direct; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.process.Property; import java.util.Date; import java.util.HashMap; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentExecute.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentExecute.java similarity index 90% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentExecute.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentExecute.java index 698c8de62c..798311aba8 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentExecute.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentExecute.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.dependent; +package org.apache.dolphinscheduler.server.worker.task.dependent; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.DependentRelation; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.model.DateInterval; -import cn.escheduler.common.model.DependentItem; -import cn.escheduler.common.utils.DependentUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.DependentRelation; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.model.DateInterval; +import org.apache.dolphinscheduler.common.model.DependentItem; +import org.apache.dolphinscheduler.common.utils.DependentUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java similarity index 83% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java index d799077f5c..8510265869 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/dependent/DependentTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTask.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.dependent; +package org.apache.dolphinscheduler.server.worker.task.dependent; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.DependResult; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.model.DependentTaskModel; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.dependent.DependentParameters; -import cn.escheduler.common.thread.Stopper; -import cn.escheduler.common.utils.DependentUtils; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.DependResult; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.model.DependentTaskModel; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.dependent.DependentParameters; +import org.apache.dolphinscheduler.common.thread.Stopper; +import org.apache.dolphinscheduler.common.utils.DependentUtils; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.slf4j.Logger; import java.util.*; -import static cn.escheduler.common.Constants.DEPENDENT_SPLIT; +import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT; public class DependentTask extends AbstractTask { diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/flink/FlinkTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/flink/FlinkTask.java similarity index 82% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/flink/FlinkTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/flink/FlinkTask.java index 2b24ef628d..de50c52ed6 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/flink/FlinkTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/flink/FlinkTask.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.flink; +package org.apache.dolphinscheduler.server.worker.task.flink; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.flink.FlinkParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.server.utils.FlinkArgsUtils; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractYarnTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.flink.FlinkParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.server.utils.FlinkArgsUtils; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractYarnTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/http/HttpTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java similarity index 91% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/http/HttpTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java index a19e1159a6..47f6f83158 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/http/HttpTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTask.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.http; +package org.apache.dolphinscheduler.server.worker.task.http; -import cn.escheduler.common.enums.HttpMethod; -import cn.escheduler.common.enums.HttpParametersType; -import cn.escheduler.common.process.HttpProperty; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.http.HttpParameters; -import cn.escheduler.common.utils.Bytes; -import cn.escheduler.common.utils.DateUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.enums.HttpMethod; +import org.apache.dolphinscheduler.common.enums.HttpParametersType; +import org.apache.dolphinscheduler.common.process.HttpProperty; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.http.HttpParameters; +import org.apache.dolphinscheduler.common.utils.Bytes; +import org.apache.dolphinscheduler.common.utils.DateUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONObject; import org.apache.commons.io.Charsets; import org.apache.commons.lang3.StringUtils; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/mr/MapReduceTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/mr/MapReduceTask.java similarity index 87% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/mr/MapReduceTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/mr/MapReduceTask.java index 9650e55e26..ec61643523 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/mr/MapReduceTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/mr/MapReduceTask.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.mr; +package org.apache.dolphinscheduler.server.worker.task.mr; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ProgramType; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.mr.MapreduceParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractYarnTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ProgramType; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.mr.MapreduceParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractYarnTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java similarity index 91% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java index 3355cbc23a..7a6aaac289 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/processdure/ProcedureTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java @@ -14,23 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.processdure; +package org.apache.dolphinscheduler.server.worker.task.processdure; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.enums.Direct; -import cn.escheduler.common.enums.TaskTimeoutStrategy; -import cn.escheduler.common.job.db.*; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.procedure.ProcedureParameters; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.DataSource; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.enums.Direct; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.job.db.BaseDataSource; +import org.apache.dolphinscheduler.common.job.db.DataSourceFactory; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.procedure.ProcedureParameters; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONObject; import com.cronutils.utils.StringUtils; import org.slf4j.Logger; @@ -41,7 +42,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import static cn.escheduler.common.enums.DataType.*; +import static org.apache.dolphinscheduler.common.enums.DataType.*; /** * procedure task diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/python/PythonTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java similarity index 82% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/python/PythonTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java index cb2bf7d27e..8a9903b09f 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/python/PythonTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.python; +package org.apache.dolphinscheduler.server.worker.task.python; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.python.PythonParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.PythonCommandExecutor; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.python.PythonParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.PythonCommandExecutor; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/shell/ShellTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java similarity index 84% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/shell/ShellTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java index 41810fc176..a7264d5977 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/shell/ShellTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.shell; +package org.apache.dolphinscheduler.server.worker.task.shell; -import cn.escheduler.common.Constants; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.shell.ShellParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.ShellCommandExecutor; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.shell.ShellParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.ShellCommandExecutor; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.slf4j.Logger; import java.io.File; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/spark/SparkTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java similarity index 81% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/spark/SparkTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java index d9c58e9f7d..2ee42160fc 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/spark/SparkTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.spark; +package org.apache.dolphinscheduler.server.worker.task.spark; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.spark.SparkParameters; -import cn.escheduler.common.utils.JSONUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.utils.SparkArgsUtils; -import cn.escheduler.server.worker.task.AbstractYarnTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.spark.SparkParameters; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.utils.SparkArgsUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractYarnTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java similarity index 90% rename from escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java index 8f8c94080a..2e82276040 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/worker/task/sql/SqlTask.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java @@ -14,32 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.sql; +package org.apache.dolphinscheduler.server.worker.task.sql; -import cn.escheduler.alert.utils.MailUtils; -import cn.escheduler.common.enums.ShowType; -import cn.escheduler.common.enums.TaskTimeoutStrategy; -import cn.escheduler.common.enums.UdfType; -import cn.escheduler.common.job.db.*; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.task.AbstractParameters; -import cn.escheduler.common.task.sql.SqlBinds; -import cn.escheduler.common.task.sql.SqlParameters; -import cn.escheduler.common.task.sql.SqlType; -import cn.escheduler.common.utils.CollectionUtils; -import cn.escheduler.common.utils.CommonUtils; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.DataSource; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.UdfFunc; -import cn.escheduler.dao.entity.User; -import cn.escheduler.server.utils.ParamUtils; -import cn.escheduler.server.utils.UDFUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.alert.utils.MailUtils; +import org.apache.dolphinscheduler.common.enums.ShowType; +import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; +import org.apache.dolphinscheduler.common.enums.UdfType; +import org.apache.dolphinscheduler.common.job.db.BaseDataSource; +import org.apache.dolphinscheduler.common.job.db.DataSourceFactory; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.task.AbstractParameters; +import org.apache.dolphinscheduler.common.task.sql.SqlBinds; +import org.apache.dolphinscheduler.common.task.sql.SqlParameters; +import org.apache.dolphinscheduler.common.task.sql.SqlType; +import org.apache.dolphinscheduler.common.utils.CollectionUtils; +import org.apache.dolphinscheduler.common.utils.CommonUtils; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.DataSource; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.UdfFunc; +import org.apache.dolphinscheduler.dao.entity.User; +import org.apache.dolphinscheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.server.utils.UDFUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; @@ -53,9 +54,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static cn.escheduler.common.Constants.*; -import static cn.escheduler.common.enums.DbType.*; - +import static org.apache.dolphinscheduler.common.Constants.*; +import static org.apache.dolphinscheduler.common.enums.DbType.*; /** * sql task */ diff --git a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java similarity index 94% rename from escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java index 2746b3172b..b0c401bcac 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKMasterClient.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKMasterClient.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.zk; +package org.apache.dolphinscheduler.server.zk; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.enums.ZKNodeType; -import cn.escheduler.common.model.MasterServer; -import cn.escheduler.common.zk.AbstractZKClient; -import cn.escheduler.dao.AlertDao; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.utils.ProcessUtils; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.enums.ZKNodeType; +import org.apache.dolphinscheduler.common.model.MasterServer; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.dao.AlertDao; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.utils.ProcessUtils; import org.apache.commons.lang.StringUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; diff --git a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClient.java similarity index 94% rename from escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java rename to dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClient.java index aeea65f2bc..1cb31a4c88 100644 --- a/escheduler-server/src/main/java/cn/escheduler/server/zk/ZKWorkerClient.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClient.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.zk; +package org.apache.dolphinscheduler.server.zk; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ZKNodeType; -import cn.escheduler.common.zk.AbstractZKClient; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ZKNodeType; +import org.apache.dolphinscheduler.common.zk.AbstractZKClient; import org.apache.commons.lang.StringUtils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.cache.PathChildrenCache; diff --git a/escheduler-server/src/main/resources/application_master.properties b/dolphinscheduler-server/src/main/resources/application_master.properties similarity index 100% rename from escheduler-server/src/main/resources/application_master.properties rename to dolphinscheduler-server/src/main/resources/application_master.properties diff --git a/escheduler-server/src/main/resources/application_worker.properties b/dolphinscheduler-server/src/main/resources/application_worker.properties similarity index 100% rename from escheduler-server/src/main/resources/application_worker.properties rename to dolphinscheduler-server/src/main/resources/application_worker.properties diff --git a/escheduler-server/src/main/resources/master.properties b/dolphinscheduler-server/src/main/resources/master.properties similarity index 100% rename from escheduler-server/src/main/resources/master.properties rename to dolphinscheduler-server/src/main/resources/master.properties diff --git a/escheduler-server/src/main/resources/master_logback.xml b/dolphinscheduler-server/src/main/resources/master_logback.xml similarity index 91% rename from escheduler-server/src/main/resources/master_logback.xml rename to dolphinscheduler-server/src/main/resources/master_logback.xml index d93878218e..cf08b9c8ab 100644 --- a/escheduler-server/src/main/resources/master_logback.xml +++ b/dolphinscheduler-server/src/main/resources/master_logback.xml @@ -12,7 +12,7 @@ ${log.base}/escheduler-master.log - + INFO diff --git a/escheduler-server/src/main/resources/worker.properties b/dolphinscheduler-server/src/main/resources/worker.properties similarity index 100% rename from escheduler-server/src/main/resources/worker.properties rename to dolphinscheduler-server/src/main/resources/worker.properties diff --git a/escheduler-server/src/main/resources/worker_logback.xml b/dolphinscheduler-server/src/main/resources/worker_logback.xml similarity index 87% rename from escheduler-server/src/main/resources/worker_logback.xml rename to dolphinscheduler-server/src/main/resources/worker_logback.xml index b3926f1a78..06a5231b20 100644 --- a/escheduler-server/src/main/resources/worker_logback.xml +++ b/dolphinscheduler-server/src/main/resources/worker_logback.xml @@ -13,8 +13,8 @@ INFO - - + + taskAppId ${log.base} @@ -34,7 +34,7 @@ ${log.base}/escheduler-worker.log - + INFO diff --git a/escheduler-server/src/test/java/cn/escheduler/server/master/AlertManagerTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/AlertManagerTest.java similarity index 85% rename from escheduler-server/src/test/java/cn/escheduler/server/master/AlertManagerTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/AlertManagerTest.java index 861995d77f..8f5dae9a5e 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/master/AlertManagerTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/AlertManagerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master; +package org.apache.dolphinscheduler.server.master; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.entity.ProcessInstance; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.dao.mapper.ProcessDefinitionMapper; -import cn.escheduler.dao.mapper.ProcessInstanceMapper; -import cn.escheduler.dao.mapper.TaskInstanceMapper; -import cn.escheduler.server.utils.AlertManager; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.entity.ProcessInstance; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; +import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; +import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; +import org.apache.dolphinscheduler.server.utils.AlertManager; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterCommandTest.java similarity index 81% rename from escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterCommandTest.java index 20852edc15..d541f43a3b 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/master/MasterCommandTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/MasterCommandTest.java @@ -14,22 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master; +package org.apache.dolphinscheduler.server.master; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.FailureStrategy; -import cn.escheduler.common.enums.TaskDependType; -import cn.escheduler.common.enums.WarningType; -import cn.escheduler.common.graph.DAG; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.common.model.TaskNodeRelation; -import cn.escheduler.common.process.ProcessDag; -import cn.escheduler.dao.entity.Command; -import cn.escheduler.dao.entity.ProcessDefinition; -import cn.escheduler.dao.mapper.CommandMapper; -import cn.escheduler.dao.mapper.ProcessDefinitionMapper; -import cn.escheduler.dao.utils.DagHelper; -import org.junit.Before; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.FailureStrategy; +import org.apache.dolphinscheduler.common.enums.TaskDependType; +import org.apache.dolphinscheduler.common.enums.WarningType; +import org.apache.dolphinscheduler.common.graph.DAG; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.common.model.TaskNodeRelation; +import org.apache.dolphinscheduler.common.process.ProcessDag; +import org.apache.dolphinscheduler.dao.entity.Command; +import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; +import org.apache.dolphinscheduler.dao.mapper.CommandMapper; +import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; +import org.apache.dolphinscheduler.dao.utils.DagHelper; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/master/ParamsTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ParamsTest.java similarity index 86% rename from escheduler-server/src/test/java/cn/escheduler/server/master/ParamsTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ParamsTest.java index c3f8ab99e3..46c68fb044 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/master/ParamsTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/ParamsTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.master; +package org.apache.dolphinscheduler.server.master; -import cn.escheduler.common.enums.CommandType; -import cn.escheduler.common.enums.DataType; -import cn.escheduler.common.enums.Direct; -import cn.escheduler.common.process.Property; -import cn.escheduler.common.utils.ParameterUtils; -import cn.escheduler.common.utils.placeholder.BusinessTimeUtils; -import cn.escheduler.server.utils.ParamUtils; +import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.DataType; +import org.apache.dolphinscheduler.common.enums.Direct; +import org.apache.dolphinscheduler.common.process.Property; +import org.apache.dolphinscheduler.common.utils.ParameterUtils; +import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; +import org.apache.dolphinscheduler.server.utils.ParamUtils; import com.alibaba.fastjson.JSON; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/worker/EnvFileTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java similarity index 97% rename from escheduler-server/src/test/java/cn/escheduler/server/worker/EnvFileTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java index 341a74e20c..5aceb67573 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/worker/EnvFileTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java @@ -1,4 +1,4 @@ -package cn.escheduler.server.worker; +package org.apache.dolphinscheduler.server.worker; import org.apache.commons.lang.StringUtils; import org.junit.Test; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/worker/shell/ShellCommandExecutorTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java similarity index 82% rename from escheduler-server/src/test/java/cn/escheduler/server/worker/shell/ShellCommandExecutorTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java index 4142850862..ba7f11e8d0 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/worker/shell/ShellCommandExecutorTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/shell/ShellCommandExecutorTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.shell; +package org.apache.dolphinscheduler.server.worker.shell; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.utils.LoggerUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskManager; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskManager; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONObject; import org.junit.Before; import org.junit.Ignore; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java similarity index 87% rename from escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java index b5dda9d16e..15da884c98 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/worker/sql/SqlExecutorTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/sql/SqlExecutorTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.sql; +package org.apache.dolphinscheduler.server.worker.sql; -import cn.escheduler.common.Constants; -import cn.escheduler.common.enums.ExecutionStatus; -import cn.escheduler.common.model.TaskNode; -import cn.escheduler.dao.DaoFactory; -import cn.escheduler.dao.ProcessDao; -import cn.escheduler.dao.entity.TaskInstance; -import cn.escheduler.server.utils.LoggerUtils; -import cn.escheduler.server.worker.task.AbstractTask; -import cn.escheduler.server.worker.task.TaskManager; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; +import org.apache.dolphinscheduler.common.model.TaskNode; +import org.apache.dolphinscheduler.dao.DaoFactory; +import org.apache.dolphinscheduler.dao.ProcessDao; +import org.apache.dolphinscheduler.dao.entity.TaskInstance; +import org.apache.dolphinscheduler.server.utils.LoggerUtils; +import org.apache.dolphinscheduler.server.worker.task.AbstractTask; +import org.apache.dolphinscheduler.server.worker.task.TaskManager; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import com.alibaba.fastjson.JSONObject; import org.junit.Before; import org.junit.Ignore; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/worker/task/dependent/DependentTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTaskTest.java similarity index 92% rename from escheduler-server/src/test/java/cn/escheduler/server/worker/task/dependent/DependentTaskTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTaskTest.java index 1dcb5a6c7e..3d428eab89 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/worker/task/dependent/DependentTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/dependent/DependentTaskTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.worker.task.dependent; +package org.apache.dolphinscheduler.server.worker.task.dependent; -import cn.escheduler.common.Constants; -import cn.escheduler.server.worker.task.TaskProps; +import org.apache.dolphinscheduler.common.Constants; +import org.apache.dolphinscheduler.server.worker.task.TaskProps; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/zk/StandaloneZKServerForTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/StandaloneZKServerForTest.java similarity index 96% rename from escheduler-server/src/test/java/cn/escheduler/server/zk/StandaloneZKServerForTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/StandaloneZKServerForTest.java index 078dbcff01..2c5d776bd5 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/zk/StandaloneZKServerForTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/StandaloneZKServerForTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package cn.escheduler.server.zk; +package org.apache.dolphinscheduler.server.zk; -import cn.escheduler.common.thread.ThreadPoolExecutors; +import org.apache.dolphinscheduler.common.thread.ThreadPoolExecutors; import org.apache.zookeeper.server.ServerConfig; import org.apache.zookeeper.server.ZooKeeperServerMain; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; diff --git a/escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java similarity index 78% rename from escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java rename to dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java index 005b338cb7..caac3bdb14 100644 --- a/escheduler-server/src/test/java/cn/escheduler/server/zk/ZKWorkerClientTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java @@ -1,15 +1,11 @@ -package cn.escheduler.server.zk; +package org.apache.dolphinscheduler.server.zk; -import cn.escheduler.common.Constants; -import cn.escheduler.common.zk.AbstractZKClient; import org.junit.Assert; import org.junit.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; - /** * */ diff --git a/escheduler-server/src/test/resources/dao/data_source.properties b/dolphinscheduler-server/src/test/resources/dao/data_source.properties similarity index 100% rename from escheduler-server/src/test/resources/dao/data_source.properties rename to dolphinscheduler-server/src/test/resources/dao/data_source.properties diff --git a/escheduler-ui/.babelrc b/dolphinscheduler-ui/.babelrc similarity index 100% rename from escheduler-ui/.babelrc rename to dolphinscheduler-ui/.babelrc diff --git a/escheduler-ui/.editorconfig b/dolphinscheduler-ui/.editorconfig similarity index 100% rename from escheduler-ui/.editorconfig rename to dolphinscheduler-ui/.editorconfig diff --git a/escheduler-ui/.env b/dolphinscheduler-ui/.env similarity index 100% rename from escheduler-ui/.env rename to dolphinscheduler-ui/.env diff --git a/escheduler-ui/.eslintrc b/dolphinscheduler-ui/.eslintrc similarity index 100% rename from escheduler-ui/.eslintrc rename to dolphinscheduler-ui/.eslintrc diff --git a/escheduler-ui/build/combo.js b/dolphinscheduler-ui/build/combo.js similarity index 100% rename from escheduler-ui/build/combo.js rename to dolphinscheduler-ui/build/combo.js diff --git a/escheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js similarity index 100% rename from escheduler-ui/build/config.js rename to dolphinscheduler-ui/build/config.js diff --git a/escheduler-ui/build/webpack.config.combined.js b/dolphinscheduler-ui/build/webpack.config.combined.js similarity index 100% rename from escheduler-ui/build/webpack.config.combined.js rename to dolphinscheduler-ui/build/webpack.config.combined.js diff --git a/escheduler-ui/build/webpack.config.dev.js b/dolphinscheduler-ui/build/webpack.config.dev.js similarity index 100% rename from escheduler-ui/build/webpack.config.dev.js rename to dolphinscheduler-ui/build/webpack.config.dev.js diff --git a/escheduler-ui/build/webpack.config.prod.js b/dolphinscheduler-ui/build/webpack.config.prod.js similarity index 100% rename from escheduler-ui/build/webpack.config.prod.js rename to dolphinscheduler-ui/build/webpack.config.prod.js diff --git a/escheduler-ui/build/webpack.config.test.js b/dolphinscheduler-ui/build/webpack.config.test.js similarity index 100% rename from escheduler-ui/build/webpack.config.test.js rename to dolphinscheduler-ui/build/webpack.config.test.js diff --git a/escheduler-ui/install-escheduler-ui.sh b/dolphinscheduler-ui/install-escheduler-ui.sh old mode 100755 new mode 100644 similarity index 99% rename from escheduler-ui/install-escheduler-ui.sh rename to dolphinscheduler-ui/install-escheduler-ui.sh index 3c9578746a..ad38e0e0ee --- a/escheduler-ui/install-escheduler-ui.sh +++ b/dolphinscheduler-ui/install-escheduler-ui.sh @@ -31,7 +31,7 @@ dolphinschedulerConf(){ root ${esc_basepath}/dist; # static file directory index index.html index.html; } - location /escheduler { + location /dolphinscheduler { proxy_pass $2; # interface address proxy_set_header Host $E_host; proxy_set_header X-Real-IP $E_remote_addr; diff --git a/escheduler-ui/package.json b/dolphinscheduler-ui/package.json similarity index 100% rename from escheduler-ui/package.json rename to dolphinscheduler-ui/package.json diff --git a/escheduler-ui/src/combo/1.0.0/3rd.css b/dolphinscheduler-ui/src/combo/1.0.0/3rd.css similarity index 100% rename from escheduler-ui/src/combo/1.0.0/3rd.css rename to dolphinscheduler-ui/src/combo/1.0.0/3rd.css diff --git a/escheduler-ui/src/combo/1.0.0/3rd.js b/dolphinscheduler-ui/src/combo/1.0.0/3rd.js similarity index 100% rename from escheduler-ui/src/combo/1.0.0/3rd.js rename to dolphinscheduler-ui/src/combo/1.0.0/3rd.js diff --git a/escheduler-ui/src/combo/1.0.0/base.css b/dolphinscheduler-ui/src/combo/1.0.0/base.css similarity index 100% rename from escheduler-ui/src/combo/1.0.0/base.css rename to dolphinscheduler-ui/src/combo/1.0.0/base.css diff --git a/escheduler-ui/src/combo/1.0.0/es5.js b/dolphinscheduler-ui/src/combo/1.0.0/es5.js similarity index 100% rename from escheduler-ui/src/combo/1.0.0/es5.js rename to dolphinscheduler-ui/src/combo/1.0.0/es5.js diff --git a/escheduler-ui/src/combo/1.0.0/local.js b/dolphinscheduler-ui/src/combo/1.0.0/local.js similarity index 100% rename from escheduler-ui/src/combo/1.0.0/local.js rename to dolphinscheduler-ui/src/combo/1.0.0/local.js diff --git a/escheduler-ui/src/font/awesome/FontAwesome.otf b/dolphinscheduler-ui/src/font/awesome/FontAwesome.otf similarity index 100% rename from escheduler-ui/src/font/awesome/FontAwesome.otf rename to dolphinscheduler-ui/src/font/awesome/FontAwesome.otf diff --git a/escheduler-ui/src/font/awesome/font-awesome.css b/dolphinscheduler-ui/src/font/awesome/font-awesome.css similarity index 100% rename from escheduler-ui/src/font/awesome/font-awesome.css rename to dolphinscheduler-ui/src/font/awesome/font-awesome.css diff --git a/escheduler-ui/src/font/awesome/fontawesome-webfont.eot b/dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.eot similarity index 100% rename from escheduler-ui/src/font/awesome/fontawesome-webfont.eot rename to dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.eot diff --git a/escheduler-ui/src/font/awesome/fontawesome-webfont.svg b/dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.svg similarity index 100% rename from escheduler-ui/src/font/awesome/fontawesome-webfont.svg rename to dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.svg diff --git a/escheduler-ui/src/font/awesome/fontawesome-webfont.ttf b/dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.ttf similarity index 100% rename from escheduler-ui/src/font/awesome/fontawesome-webfont.ttf rename to dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.ttf diff --git a/escheduler-ui/src/font/awesome/fontawesome-webfont.woff b/dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.woff similarity index 100% rename from escheduler-ui/src/font/awesome/fontawesome-webfont.woff rename to dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.woff diff --git a/escheduler-ui/src/font/awesome/fontawesome-webfont.woff2 b/dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.woff2 similarity index 100% rename from escheduler-ui/src/font/awesome/fontawesome-webfont.woff2 rename to dolphinscheduler-ui/src/font/awesome/fontawesome-webfont.woff2 diff --git a/escheduler-ui/src/font/demo.css b/dolphinscheduler-ui/src/font/demo.css similarity index 100% rename from escheduler-ui/src/font/demo.css rename to dolphinscheduler-ui/src/font/demo.css diff --git a/escheduler-ui/src/font/demo_index.html b/dolphinscheduler-ui/src/font/demo_index.html similarity index 100% rename from escheduler-ui/src/font/demo_index.html rename to dolphinscheduler-ui/src/font/demo_index.html diff --git a/escheduler-ui/src/font/iconfont.css b/dolphinscheduler-ui/src/font/iconfont.css similarity index 100% rename from escheduler-ui/src/font/iconfont.css rename to dolphinscheduler-ui/src/font/iconfont.css diff --git a/escheduler-ui/src/font/iconfont.eot b/dolphinscheduler-ui/src/font/iconfont.eot similarity index 100% rename from escheduler-ui/src/font/iconfont.eot rename to dolphinscheduler-ui/src/font/iconfont.eot diff --git a/escheduler-ui/src/font/iconfont.js b/dolphinscheduler-ui/src/font/iconfont.js similarity index 100% rename from escheduler-ui/src/font/iconfont.js rename to dolphinscheduler-ui/src/font/iconfont.js diff --git a/escheduler-ui/src/font/iconfont.svg b/dolphinscheduler-ui/src/font/iconfont.svg similarity index 100% rename from escheduler-ui/src/font/iconfont.svg rename to dolphinscheduler-ui/src/font/iconfont.svg diff --git a/escheduler-ui/src/font/iconfont.ttf b/dolphinscheduler-ui/src/font/iconfont.ttf similarity index 100% rename from escheduler-ui/src/font/iconfont.ttf rename to dolphinscheduler-ui/src/font/iconfont.ttf diff --git a/escheduler-ui/src/font/iconfont.woff b/dolphinscheduler-ui/src/font/iconfont.woff similarity index 100% rename from escheduler-ui/src/font/iconfont.woff rename to dolphinscheduler-ui/src/font/iconfont.woff diff --git a/escheduler-ui/src/font/iconfont.woff2 b/dolphinscheduler-ui/src/font/iconfont.woff2 similarity index 100% rename from escheduler-ui/src/font/iconfont.woff2 rename to dolphinscheduler-ui/src/font/iconfont.woff2 diff --git a/escheduler-ui/src/images/favicon.ico b/dolphinscheduler-ui/src/images/favicon.ico similarity index 100% rename from escheduler-ui/src/images/favicon.ico rename to dolphinscheduler-ui/src/images/favicon.ico diff --git a/escheduler-ui/src/js/conf/home/App.vue b/dolphinscheduler-ui/src/js/conf/home/App.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/App.vue rename to dolphinscheduler-ui/src/js/conf/home/App.vue diff --git a/escheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/index.js rename to dolphinscheduler-ui/src/js/conf/home/index.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/config.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/dag.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.scss similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.scss rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.scss diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/resources.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/sqlType.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/statementList.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/jumpAffirm.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/dag_bg.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/dag_bg.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/dag_bg.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/dag_bg.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_HTTP.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toobar_flink.svg diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DEPENDENT.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DEPENDENT.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DEPENDENT.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_DEPENDENT.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_MR.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_MR.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_MR.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_MR.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PROCEDURE.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PROCEDURE.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PROCEDURE.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PROCEDURE.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PYTHON.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PYTHON.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PYTHON.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_PYTHON.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SHELL.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SHELL.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SHELL.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SHELL.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SPARK.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SPARK.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SPARK.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SPARK.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SQL.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SQL.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SQL.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SQL.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SUB_PROCESS.png b/dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SUB_PROCESS.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SUB_PROCESS.png rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SUB_PROCESS.png diff --git a/escheduler-ui/src/js/conf/home/pages/dag/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/datasource/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/datasource/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/home/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/home/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gauge.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gauge.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gauge.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gauge.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/alert.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/apiserver.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/mysql.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/rpcserver.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/servers.scss diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue diff --git a/escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/zookeeper.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/create/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/create/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/create/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/details/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/details/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/details/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/img/dag_bg.png b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/img/dag_bg.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/img/dag_bg.png rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/img/dag_bg.png diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/historyTaskRecord/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/img/dag_bg.png b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/img/dag_bg.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/img/dag_bg.png rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/img/dag_bg.png diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/taskRecord/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskRecord/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/taskRecord/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskRecord/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/codemirror.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/codemirror.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/codemirror.js rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/codemirror.js diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/down_error.png b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/down_error.png similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/down_error.png rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/down_error.png diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/noType.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/noType.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/noType.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/noType.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue diff --git a/escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/createQueue.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/createWorker.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue diff --git a/escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue similarity index 100% rename from escheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue diff --git a/escheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/router/index.js rename to dolphinscheduler-ui/src/js/conf/home/router/index.js diff --git a/escheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/dag/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/dag/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/dag/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/dag/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/dag/index.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/dag/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/dag/index.js diff --git a/escheduler-ui/src/js/conf/home/store/dag/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/dag/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/dag/state.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/dag/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/dag/state.js diff --git a/escheduler-ui/src/js/conf/home/store/datasource/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/datasource/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/datasource/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/datasource/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/datasource/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/datasource/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/datasource/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/datasource/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/datasource/index.js b/dolphinscheduler-ui/src/js/conf/home/store/datasource/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/datasource/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/datasource/index.js diff --git a/escheduler-ui/src/js/conf/home/store/datasource/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/datasource/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/datasource/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/datasource/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/datasource/state.js b/dolphinscheduler-ui/src/js/conf/home/store/datasource/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/datasource/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/datasource/state.js diff --git a/escheduler-ui/src/js/conf/home/store/index.js b/dolphinscheduler-ui/src/js/conf/home/store/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/index.js diff --git a/escheduler-ui/src/js/conf/home/store/monitor/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/monitor/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/monitor/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/monitor/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/monitor/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/monitor/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/monitor/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/monitor/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/monitor/index.js b/dolphinscheduler-ui/src/js/conf/home/store/monitor/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/monitor/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/monitor/index.js diff --git a/escheduler-ui/src/js/conf/home/store/monitor/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/monitor/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/monitor/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/monitor/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/monitor/state.js b/dolphinscheduler-ui/src/js/conf/home/store/monitor/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/monitor/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/monitor/state.js diff --git a/escheduler-ui/src/js/conf/home/store/projects/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/projects/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/projects/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/projects/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/projects/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/projects/index.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/projects/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/projects/index.js diff --git a/escheduler-ui/src/js/conf/home/store/projects/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/projects/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/projects/state.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/projects/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/projects/state.js diff --git a/escheduler-ui/src/js/conf/home/store/resource/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/resource/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/resource/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/resource/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/resource/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/resource/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/resource/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/resource/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/resource/index.js b/dolphinscheduler-ui/src/js/conf/home/store/resource/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/resource/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/resource/index.js diff --git a/escheduler-ui/src/js/conf/home/store/resource/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/resource/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/resource/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/resource/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/resource/state.js b/dolphinscheduler-ui/src/js/conf/home/store/resource/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/resource/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/resource/state.js diff --git a/escheduler-ui/src/js/conf/home/store/security/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/security/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/security/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/security/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/security/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/security/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/security/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/security/index.js b/dolphinscheduler-ui/src/js/conf/home/store/security/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/security/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/security/index.js diff --git a/escheduler-ui/src/js/conf/home/store/security/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/security/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/security/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/security/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/security/state.js b/dolphinscheduler-ui/src/js/conf/home/store/security/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/security/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/security/state.js diff --git a/escheduler-ui/src/js/conf/home/store/user/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/user/actions.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/user/actions.js rename to dolphinscheduler-ui/src/js/conf/home/store/user/actions.js diff --git a/escheduler-ui/src/js/conf/home/store/user/getters.js b/dolphinscheduler-ui/src/js/conf/home/store/user/getters.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/user/getters.js rename to dolphinscheduler-ui/src/js/conf/home/store/user/getters.js diff --git a/escheduler-ui/src/js/conf/home/store/user/index.js b/dolphinscheduler-ui/src/js/conf/home/store/user/index.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/user/index.js rename to dolphinscheduler-ui/src/js/conf/home/store/user/index.js diff --git a/escheduler-ui/src/js/conf/home/store/user/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/user/mutations.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/user/mutations.js rename to dolphinscheduler-ui/src/js/conf/home/store/user/mutations.js diff --git a/escheduler-ui/src/js/conf/home/store/user/state.js b/dolphinscheduler-ui/src/js/conf/home/store/user/state.js similarity index 100% rename from escheduler-ui/src/js/conf/home/store/user/state.js rename to dolphinscheduler-ui/src/js/conf/home/store/user/state.js diff --git a/escheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue similarity index 100% rename from escheduler-ui/src/js/conf/login/App.vue rename to dolphinscheduler-ui/src/js/conf/login/App.vue diff --git a/escheduler-ui/src/js/conf/login/img/login-logo.png b/dolphinscheduler-ui/src/js/conf/login/img/login-logo.png similarity index 100% rename from escheduler-ui/src/js/conf/login/img/login-logo.png rename to dolphinscheduler-ui/src/js/conf/login/img/login-logo.png diff --git a/escheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js similarity index 100% rename from escheduler-ui/src/js/conf/login/index.js rename to dolphinscheduler-ui/src/js/conf/login/index.js diff --git a/escheduler-ui/src/js/module/components/conditions/conditions.vue b/dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue similarity index 100% rename from escheduler-ui/src/js/module/components/conditions/conditions.vue rename to dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue diff --git a/escheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue similarity index 100% rename from escheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue rename to dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue diff --git a/escheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue similarity index 100% rename from escheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue rename to dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue diff --git a/escheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue similarity index 100% rename from escheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue rename to dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue diff --git a/escheduler-ui/src/js/module/components/layout/layout.vue b/dolphinscheduler-ui/src/js/module/components/layout/layout.vue similarity index 100% rename from escheduler-ui/src/js/module/components/layout/layout.vue rename to dolphinscheduler-ui/src/js/module/components/layout/layout.vue diff --git a/escheduler-ui/src/js/module/components/listBoxF/listBoxF.vue b/dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue similarity index 100% rename from escheduler-ui/src/js/module/components/listBoxF/listBoxF.vue rename to dolphinscheduler-ui/src/js/module/components/listBoxF/listBoxF.vue diff --git a/escheduler-ui/src/js/module/components/listConstruction/listConstruction.vue b/dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue similarity index 100% rename from escheduler-ui/src/js/module/components/listConstruction/listConstruction.vue rename to dolphinscheduler-ui/src/js/module/components/listConstruction/listConstruction.vue diff --git a/escheduler-ui/src/js/module/components/nav/logo.png b/dolphinscheduler-ui/src/js/module/components/nav/logo.png similarity index 100% rename from escheduler-ui/src/js/module/components/nav/logo.png rename to dolphinscheduler-ui/src/js/module/components/nav/logo.png diff --git a/escheduler-ui/src/js/module/components/nav/m_logo.png b/dolphinscheduler-ui/src/js/module/components/nav/m_logo.png similarity index 100% rename from escheduler-ui/src/js/module/components/nav/m_logo.png rename to dolphinscheduler-ui/src/js/module/components/nav/m_logo.png diff --git a/escheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue similarity index 100% rename from escheduler-ui/src/js/module/components/nav/nav.vue rename to dolphinscheduler-ui/src/js/module/components/nav/nav.vue diff --git a/escheduler-ui/src/js/module/components/noData/images/errorTip.png b/dolphinscheduler-ui/src/js/module/components/noData/images/errorTip.png similarity index 100% rename from escheduler-ui/src/js/module/components/noData/images/errorTip.png rename to dolphinscheduler-ui/src/js/module/components/noData/images/errorTip.png diff --git a/escheduler-ui/src/js/module/components/noData/noData.vue b/dolphinscheduler-ui/src/js/module/components/noData/noData.vue similarity index 100% rename from escheduler-ui/src/js/module/components/noData/noData.vue rename to dolphinscheduler-ui/src/js/module/components/noData/noData.vue diff --git a/escheduler-ui/src/js/module/components/popup/popup.vue b/dolphinscheduler-ui/src/js/module/components/popup/popup.vue similarity index 100% rename from escheduler-ui/src/js/module/components/popup/popup.vue rename to dolphinscheduler-ui/src/js/module/components/popup/popup.vue diff --git a/escheduler-ui/src/js/module/components/priority/priority.vue b/dolphinscheduler-ui/src/js/module/components/priority/priority.vue similarity index 100% rename from escheduler-ui/src/js/module/components/priority/priority.vue rename to dolphinscheduler-ui/src/js/module/components/priority/priority.vue diff --git a/escheduler-ui/src/js/module/components/progressBar/progressBar.vue b/dolphinscheduler-ui/src/js/module/components/progressBar/progressBar.vue similarity index 100% rename from escheduler-ui/src/js/module/components/progressBar/progressBar.vue rename to dolphinscheduler-ui/src/js/module/components/progressBar/progressBar.vue diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/_source/close.png b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/close.png similarity index 100% rename from escheduler-ui/src/js/module/components/secondaryMenu/_source/close.png rename to dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/close.png diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js similarity index 100% rename from escheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js rename to dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/_source/open.png b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/open.png similarity index 100% rename from escheduler-ui/src/js/module/components/secondaryMenu/_source/open.png rename to dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/open.png diff --git a/escheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue similarity index 100% rename from escheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue rename to dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue diff --git a/escheduler-ui/src/js/module/components/spin/spin.vue b/dolphinscheduler-ui/src/js/module/components/spin/spin.vue similarity index 100% rename from escheduler-ui/src/js/module/components/spin/spin.vue rename to dolphinscheduler-ui/src/js/module/components/spin/spin.vue diff --git a/escheduler-ui/src/js/module/components/tooltipsJSON/tooltipsJSON.vue b/dolphinscheduler-ui/src/js/module/components/tooltipsJSON/tooltipsJSON.vue similarity index 100% rename from escheduler-ui/src/js/module/components/tooltipsJSON/tooltipsJSON.vue rename to dolphinscheduler-ui/src/js/module/components/tooltipsJSON/tooltipsJSON.vue diff --git a/escheduler-ui/src/js/module/components/transfer/transfer.vue b/dolphinscheduler-ui/src/js/module/components/transfer/transfer.vue similarity index 100% rename from escheduler-ui/src/js/module/components/transfer/transfer.vue rename to dolphinscheduler-ui/src/js/module/components/transfer/transfer.vue diff --git a/escheduler-ui/src/js/module/download/index.js b/dolphinscheduler-ui/src/js/module/download/index.js similarity index 100% rename from escheduler-ui/src/js/module/download/index.js rename to dolphinscheduler-ui/src/js/module/download/index.js diff --git a/escheduler-ui/src/js/module/echarts/themeData.json b/dolphinscheduler-ui/src/js/module/echarts/themeData.json similarity index 100% rename from escheduler-ui/src/js/module/echarts/themeData.json rename to dolphinscheduler-ui/src/js/module/echarts/themeData.json diff --git a/escheduler-ui/src/js/module/filter/filter.js b/dolphinscheduler-ui/src/js/module/filter/filter.js similarity index 100% rename from escheduler-ui/src/js/module/filter/filter.js rename to dolphinscheduler-ui/src/js/module/filter/filter.js diff --git a/escheduler-ui/src/js/module/filter/formatDate.js b/dolphinscheduler-ui/src/js/module/filter/formatDate.js similarity index 100% rename from escheduler-ui/src/js/module/filter/formatDate.js rename to dolphinscheduler-ui/src/js/module/filter/formatDate.js diff --git a/escheduler-ui/src/js/module/i18n/config.js b/dolphinscheduler-ui/src/js/module/i18n/config.js similarity index 100% rename from escheduler-ui/src/js/module/i18n/config.js rename to dolphinscheduler-ui/src/js/module/i18n/config.js diff --git a/escheduler-ui/src/js/module/i18n/index.js b/dolphinscheduler-ui/src/js/module/i18n/index.js similarity index 100% rename from escheduler-ui/src/js/module/i18n/index.js rename to dolphinscheduler-ui/src/js/module/i18n/index.js diff --git a/escheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js similarity index 100% rename from escheduler-ui/src/js/module/i18n/locale/en_US.js rename to dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js diff --git a/escheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js similarity index 100% rename from escheduler-ui/src/js/module/i18n/locale/zh_CN.js rename to dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js diff --git a/escheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js similarity index 100% rename from escheduler-ui/src/js/module/io/index.js rename to dolphinscheduler-ui/src/js/module/io/index.js diff --git a/escheduler-ui/src/js/module/mixin/disabledState.js b/dolphinscheduler-ui/src/js/module/mixin/disabledState.js similarity index 100% rename from escheduler-ui/src/js/module/mixin/disabledState.js rename to dolphinscheduler-ui/src/js/module/mixin/disabledState.js diff --git a/escheduler-ui/src/js/module/mixin/listUrlParamHandle.js b/dolphinscheduler-ui/src/js/module/mixin/listUrlParamHandle.js similarity index 100% rename from escheduler-ui/src/js/module/mixin/listUrlParamHandle.js rename to dolphinscheduler-ui/src/js/module/mixin/listUrlParamHandle.js diff --git a/escheduler-ui/src/js/module/permissions/index.js b/dolphinscheduler-ui/src/js/module/permissions/index.js similarity index 100% rename from escheduler-ui/src/js/module/permissions/index.js rename to dolphinscheduler-ui/src/js/module/permissions/index.js diff --git a/escheduler-ui/src/js/module/util/clickoutside.js b/dolphinscheduler-ui/src/js/module/util/clickoutside.js similarity index 100% rename from escheduler-ui/src/js/module/util/clickoutside.js rename to dolphinscheduler-ui/src/js/module/util/clickoutside.js diff --git a/escheduler-ui/src/js/module/util/cookie.js b/dolphinscheduler-ui/src/js/module/util/cookie.js similarity index 100% rename from escheduler-ui/src/js/module/util/cookie.js rename to dolphinscheduler-ui/src/js/module/util/cookie.js diff --git a/escheduler-ui/src/js/module/util/index.js b/dolphinscheduler-ui/src/js/module/util/index.js similarity index 100% rename from escheduler-ui/src/js/module/util/index.js rename to dolphinscheduler-ui/src/js/module/util/index.js diff --git a/escheduler-ui/src/js/module/util/localStorage.js b/dolphinscheduler-ui/src/js/module/util/localStorage.js similarity index 100% rename from escheduler-ui/src/js/module/util/localStorage.js rename to dolphinscheduler-ui/src/js/module/util/localStorage.js diff --git a/escheduler-ui/src/js/module/util/routerUtil.js b/dolphinscheduler-ui/src/js/module/util/routerUtil.js similarity index 100% rename from escheduler-ui/src/js/module/util/routerUtil.js rename to dolphinscheduler-ui/src/js/module/util/routerUtil.js diff --git a/escheduler-ui/src/js/module/util/util.js b/dolphinscheduler-ui/src/js/module/util/util.js similarity index 100% rename from escheduler-ui/src/js/module/util/util.js rename to dolphinscheduler-ui/src/js/module/util/util.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/README.md b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/README.md diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/build/config.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/build/config.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/build/config.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/build/config.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/build/webpack.config.prod.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/build/webpack.config.prod.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/build/webpack.config.prod.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/build/webpack.config.prod.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/dist/index.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/dist/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/dist/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/dist/index.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/dist/index.js.map b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/dist/index.js.map similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/dist/index.js.map rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/dist/index.js.map diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/mock/data.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/mock/data.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/mock/data.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/mock/data.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/mock/theme.json b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/mock/theme.json similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/mock/theme.json rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/mock/theme.json diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/bar.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/bar.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/bar.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/bar.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/funnel.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/funnel.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/funnel.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/funnel.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/line.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/line.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/line.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/line.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/pie.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/pie.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/pie.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/pie.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/radar.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/radar.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/radar.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/radar.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/packages/scatter.vue b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/scatter.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/packages/scatter.vue rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/packages/scatter.vue diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/router/index.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/router/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/router/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/router/index.js diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/example/styles/main.scss b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/styles/main.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/example/styles/main.scss rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/example/styles/main.scss diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/package.json b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/package.json similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/package.json rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/package.json diff --git a/escheduler-ui/src/lib/@analysys/ana-charts/postcss.config.js b/dolphinscheduler-ui/src/lib/@analysys/ana-charts/postcss.config.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ana-charts/postcss.config.js rename to dolphinscheduler-ui/src/lib/@analysys/ana-charts/postcss.config.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.css b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.css similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.css rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.css diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/ans-ui.min.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.eot b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.eot similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.eot rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.eot diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.svg b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.svg similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.svg rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.svg diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.ttf b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.ttf similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.ttf rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.ttf diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.woff b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.woff similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.woff rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/font/iconfont.woff diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js.map b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js.map similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js.map rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/en.js.map diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js.map b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js.map similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js.map rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/lib/locale/zh-CN.js.map diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/package.json b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/package.json similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/package.json rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/package.json diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/Box.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/Box.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/Box.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/Box.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/BoxManager.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/BoxManager.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/BoxManager.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/BoxManager.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/base/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/message/message.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/message/message.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/message/message.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/message/message.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/modal/modal.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/modal/modal.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/modal/modal.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/modal/modal.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/notice/notice.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/notice/notice.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/notice/notice.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-box/src/source/layer/notice/notice.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/Button.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/Button.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/Button.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/Button.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/ButtonGroup.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/ButtonGroup.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/ButtonGroup.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-button/src/source/ButtonGroup.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/data.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/data.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/data.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/data.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Cascader.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Cascader.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Cascader.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Cascader.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Caspanel.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Caspanel.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Caspanel.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-cascader/src/source/Caspanel.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/Checkbox.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/Checkbox.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/Checkbox.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/Checkbox.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/CheckboxGroup.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/CheckboxGroup.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/CheckboxGroup.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-checkbox/src/source/CheckboxGroup.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/confirm.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/confirm.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/confirm.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/confirm.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/day.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/day.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/day.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/day.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/time.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/time.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/time.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/time.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/years.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/years.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/years.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/base/years.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/datepicker.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/datepicker.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/datepicker.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/datepicker.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/date.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/date.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/date.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/date.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/daterange.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/daterange.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/daterange.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/daterange.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/month.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/month.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/month.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/month.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/time.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/time.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/time.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/time.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/year.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/year.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/year.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/panel/year.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/date.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/date.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/date.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/date.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isType.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isType.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isType.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isType.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isValid.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isValid.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isValid.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/isValid.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/ishms.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/ishms.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/ishms.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/ishms.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/todate.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/todate.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/todate.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-datepicker/src/source/util/todate.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/test.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/test.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/test.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/example/test.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/source/drawer.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/source/drawer.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/source/drawer.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-drawer/src/source/drawer.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/Form.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/Form.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/Form.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/Form.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/FormItem.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/FormItem.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/FormItem.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-form/src/source/FormItem.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/Input.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/Input.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/Input.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/Input.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/util/calcTextareaHeight.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/util/calcTextareaHeight.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/util/calcTextareaHeight.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-input/src/source/util/calcTextareaHeight.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/source/Page.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/source/Page.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/source/Page.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-pagination/src/source/Page.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/Poptip.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/Poptip.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/Poptip.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/Poptip.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/directive.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/directive.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/directive.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-poptip/src/source/directive.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/source/Progress.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/source/Progress.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/source/Progress.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-progress/src/source/Progress.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/Radio.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/Radio.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/Radio.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/Radio.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/RadioGroup.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/RadioGroup.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/RadioGroup.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-radio/src/source/RadioGroup.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/HorizontalScrollbar.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/HorizontalScrollbar.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/HorizontalScrollbar.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/HorizontalScrollbar.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/Scroller.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/Scroller.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/Scroller.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/Scroller.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/VerticalScrollbar.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/VerticalScrollbar.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/VerticalScrollbar.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-scroller/src/source/VerticalScrollbar.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/async.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/async.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/async.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/async.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/dynamic.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/dynamic.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/dynamic.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/dynamic.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/navigation.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/navigation.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/navigation.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/example/navigation.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Option.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Option.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Option.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Option.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/OptionGroup.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/OptionGroup.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/OptionGroup.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/OptionGroup.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Select.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Select.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Select.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/Select.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/SelectDropdown.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/SelectDropdown.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/SelectDropdown.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-select/src/source/SelectDropdown.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/Spin.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/Spin.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/Spin.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/Spin.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/directive.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/directive.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/directive.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/directive.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/service.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/service.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/service.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-spin/src/source/service.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/source/Switch.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/source/Switch.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/source/Switch.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-switch/src/source/Switch.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/array.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/array.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/array.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/array.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/dynamic.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/dynamic.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/dynamic.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/dynamic.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/indexs.json b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/indexs.json similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/indexs.json rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/indexs.json diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/paging.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/paging.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/paging.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/paging.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/restrict.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/restrict.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/restrict.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/restrict.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/sort.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/sort.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/sort.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/sort.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/tree.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/tree.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/tree.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/example/tree.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/Table.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/Table.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/Table.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/Table.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableBody.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableBody.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableBody.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableBody.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableColumn.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableColumn.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableColumn.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableColumn.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableHeader.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableHeader.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableHeader.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableHeader.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTd.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTd.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTd.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTd.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTh.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTh.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTh.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/TableTh.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/cellRenderer.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/cellRenderer.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/cellRenderer.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/cellRenderer.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layout.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layout.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layout.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layout.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layoutObserver.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layoutObserver.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layoutObserver.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/layoutObserver.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/store.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/store.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/store.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-table/src/source/store.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/source/Timepicker.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/source/Timepicker.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/source/Timepicker.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-timepicker/src/source/Timepicker.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/README.md b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/README.md similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/README.md rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/README.md diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/app.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/app.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/app.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.html b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.html rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.html diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/example/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/Tooltip.vue b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/Tooltip.vue similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/Tooltip.vue rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/Tooltip.vue diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/directive.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/directive.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/directive.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/directive.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/factory.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/factory.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/factory.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/packages/vue-tooltip/src/source/factory.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/locale/format.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/format.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/locale/format.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/format.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/locale/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/locale/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/en.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/en.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/en.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/en.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/zh-CN.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/zh-CN.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/zh-CN.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/locale/lang/zh-CN.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/attentionSeekers.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/attentionSeekers.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/attentionSeekers.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/attentionSeekers.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingEntrances.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingEntrances.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingEntrances.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingEntrances.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingExits.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingExits.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingExits.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/bouncingExits.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingEntrances.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingEntrances.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingEntrances.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingEntrances.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingExits.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingExits.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingExits.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/fadingExits.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/flippers.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/flippers.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/flippers.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/flippers.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/index.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/index.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/index.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/index.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/lightspeed.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/lightspeed.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/lightspeed.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/lightspeed.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingEntrances.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingEntrances.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingEntrances.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingEntrances.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingExits.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingExits.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingExits.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/rotatingExits.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingEntrances.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingEntrances.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingEntrances.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingEntrances.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingExits.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingExits.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingExits.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/slidingExits.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/specials.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/specials.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/specials.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/specials.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomEntrances.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomEntrances.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomEntrances.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomEntrances.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomExits.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomExits.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomExits.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/animation/zoomExits.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/common.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/common.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/common.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/common.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/box.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/box.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/box.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/box.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/message.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/message.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/message.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/message.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/modal.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/modal.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/modal.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/modal.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/notice.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/notice.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/notice.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/box/notice.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/button.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/button.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/button.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/button.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/mixin.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/mixin.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/mixin.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/button/mixin.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/cascader/cascader.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/cascader/cascader.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/cascader/cascader.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/cascader/cascader.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/checkbox/checkbox.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/checkbox/checkbox.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/checkbox/checkbox.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/checkbox/checkbox.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/datepicker/datepicker.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/datepicker/datepicker.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/datepicker/datepicker.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/datepicker/datepicker.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/drawer/drawer.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/drawer/drawer.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/drawer/drawer.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/drawer/drawer.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/form/form.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/form/form.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/form/form.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/form/form.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/index.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/index.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/index.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/index.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/input/input.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/input/input.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/input/input.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/input/input.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/pagination/pagination.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/pagination/pagination.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/pagination/pagination.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/pagination/pagination.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/poptip/poptip.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/poptip/poptip.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/poptip/poptip.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/poptip/poptip.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/progress/progress.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/progress/progress.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/progress/progress.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/progress/progress.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/radio/radio.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/radio/radio.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/radio/radio.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/radio/radio.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/scroller/scroller.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/scroller/scroller.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/scroller/scroller.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/scroller/scroller.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/select/select.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/select/select.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/select/select.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/select/select.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/spin/spin.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/spin/spin.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/spin/spin.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/spin/spin.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/switch/switch.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/switch/switch.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/switch/switch.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/switch/switch.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/table/table.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/table/table.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/table/table.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/table/table.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/tooltip/tooltip.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/tooltip/tooltip.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/components/tooltip/tooltip.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/components/tooltip/tooltip.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/font.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/font.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.eot b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.eot similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.eot rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.eot diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.svg b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.svg similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.svg rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.svg diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.ttf b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.ttf similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.ttf rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.ttf diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.woff b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.woff similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.woff rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/font/iconfont.woff diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/index.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/index.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/index.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/index.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/style/vars.scss b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/vars.scss similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/style/vars.scss rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/style/vars.scss diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/assist.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/assist.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/assist.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/assist.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/constants.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/constants.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/constants.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/constants.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/customRenderer.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/customRenderer.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/customRenderer.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/customRenderer.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/clickOutside.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/clickOutside.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/clickOutside.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/clickOutside.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/mousewheel.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/mousewheel.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/mousewheel.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/directives/mousewheel.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/animatedScroll.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/animatedScroll.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/animatedScroll.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/animatedScroll.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/class.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/class.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/class.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/class.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/limitedLoop.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/limitedLoop.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/limitedLoop.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/limitedLoop.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollIntoView.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollIntoView.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollIntoView.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollIntoView.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollbarWidth.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollbarWidth.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollbarWidth.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/scrollbarWidth.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/style.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/style.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/style.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/dom/style.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/event.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/event.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/event.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/event.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/lang.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/lang.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/lang.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/lang.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/emitter.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/emitter.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/emitter.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/emitter.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/index.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/index.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/index.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/index.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/locale.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/locale.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/locale.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/locale.js diff --git a/escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/popper.js b/dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/popper.js similarity index 100% rename from escheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/popper.js rename to dolphinscheduler-ui/src/lib/@analysys/ans-ui/src/util/mixins/popper.js diff --git a/escheduler-ui/src/lib/@fedor/io/README.md b/dolphinscheduler-ui/src/lib/@fedor/io/README.md similarity index 100% rename from escheduler-ui/src/lib/@fedor/io/README.md rename to dolphinscheduler-ui/src/lib/@fedor/io/README.md diff --git a/escheduler-ui/src/lib/@fedor/io/dist/io.esm.js b/dolphinscheduler-ui/src/lib/@fedor/io/dist/io.esm.js similarity index 100% rename from escheduler-ui/src/lib/@fedor/io/dist/io.esm.js rename to dolphinscheduler-ui/src/lib/@fedor/io/dist/io.esm.js diff --git a/escheduler-ui/src/lib/@fedor/io/dist/io.js b/dolphinscheduler-ui/src/lib/@fedor/io/dist/io.js similarity index 100% rename from escheduler-ui/src/lib/@fedor/io/dist/io.js rename to dolphinscheduler-ui/src/lib/@fedor/io/dist/io.js diff --git a/escheduler-ui/src/lib/@fedor/io/dist/io.min.js b/dolphinscheduler-ui/src/lib/@fedor/io/dist/io.min.js similarity index 100% rename from escheduler-ui/src/lib/@fedor/io/dist/io.min.js rename to dolphinscheduler-ui/src/lib/@fedor/io/dist/io.min.js diff --git a/escheduler-ui/src/lib/@fedor/io/package.json b/dolphinscheduler-ui/src/lib/@fedor/io/package.json similarity index 100% rename from escheduler-ui/src/lib/@fedor/io/package.json rename to dolphinscheduler-ui/src/lib/@fedor/io/package.json diff --git a/escheduler-ui/src/lib/@fedor/progress-webpack-plugin/lib/index.js b/dolphinscheduler-ui/src/lib/@fedor/progress-webpack-plugin/lib/index.js similarity index 100% rename from escheduler-ui/src/lib/@fedor/progress-webpack-plugin/lib/index.js rename to dolphinscheduler-ui/src/lib/@fedor/progress-webpack-plugin/lib/index.js diff --git a/escheduler-ui/src/lib/@fedor/progress-webpack-plugin/package.json b/dolphinscheduler-ui/src/lib/@fedor/progress-webpack-plugin/package.json similarity index 100% rename from escheduler-ui/src/lib/@fedor/progress-webpack-plugin/package.json rename to dolphinscheduler-ui/src/lib/@fedor/progress-webpack-plugin/package.json diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/.circleci/config.yml b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/.circleci/config.yml similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/.circleci/config.yml rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/.circleci/config.yml diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/.prettierrc.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/.prettierrc.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/.prettierrc.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/.prettierrc.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/CHANGELOG.md b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/CHANGELOG.md similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/CHANGELOG.md rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/CHANGELOG.md diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/README.md b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/README.md similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/README.md rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/README.md diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileStyle.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/compileTemplate.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/index.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/parse.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/scoped.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/stylePlugins/trim.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/styleProcessors/index.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/assetUrl.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/srcset.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/templateCompilerModules/utils.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.d.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.d.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.d.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.d.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.js b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.js similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.js rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/dist/types.js diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileStyle.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileStyle.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileStyle.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileStyle.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileTemplate.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileTemplate.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileTemplate.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/compileTemplate.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/index.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/index.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/index.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/index.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/parse.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/parse.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/parse.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/parse.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/scoped.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/scoped.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/scoped.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/scoped.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/trim.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/trim.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/trim.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/stylePlugins/trim.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/styleProcessors/index.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/styleProcessors/index.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/styleProcessors/index.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/styleProcessors/index.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/assetUrl.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/assetUrl.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/assetUrl.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/assetUrl.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/srcset.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/srcset.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/srcset.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/srcset.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/utils.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/utils.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/utils.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/templateCompilerModules/utils.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/lib/types.ts b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/types.ts similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/lib/types.ts rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/lib/types.ts diff --git a/escheduler-ui/src/lib/@vue/component-compiler-utils/package.json b/dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/package.json similarity index 100% rename from escheduler-ui/src/lib/@vue/component-compiler-utils/package.json rename to dolphinscheduler-ui/src/lib/@vue/component-compiler-utils/package.json diff --git a/escheduler-ui/src/lib/@vue/crontab/README.md b/dolphinscheduler-ui/src/lib/@vue/crontab/README.md similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/README.md rename to dolphinscheduler-ui/src/lib/@vue/crontab/README.md diff --git a/escheduler-ui/src/lib/@vue/crontab/build/config.js b/dolphinscheduler-ui/src/lib/@vue/crontab/build/config.js similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/build/config.js rename to dolphinscheduler-ui/src/lib/@vue/crontab/build/config.js diff --git a/escheduler-ui/src/lib/@vue/crontab/build/webpack.config.prod.js b/dolphinscheduler-ui/src/lib/@vue/crontab/build/webpack.config.prod.js similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/build/webpack.config.prod.js rename to dolphinscheduler-ui/src/lib/@vue/crontab/build/webpack.config.prod.js diff --git a/escheduler-ui/src/lib/@vue/crontab/dist/index.css b/dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.css similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/dist/index.css rename to dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.css diff --git a/escheduler-ui/src/lib/@vue/crontab/dist/index.js b/dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/dist/index.js rename to dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js diff --git a/escheduler-ui/src/lib/@vue/crontab/dist/index.js.map b/dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js.map similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/dist/index.js.map rename to dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js.map diff --git a/escheduler-ui/src/lib/@vue/crontab/example/app.vue b/dolphinscheduler-ui/src/lib/@vue/crontab/example/app.vue similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/example/app.vue rename to dolphinscheduler-ui/src/lib/@vue/crontab/example/app.vue diff --git a/escheduler-ui/src/lib/@vue/crontab/example/index.html b/dolphinscheduler-ui/src/lib/@vue/crontab/example/index.html similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/example/index.html rename to dolphinscheduler-ui/src/lib/@vue/crontab/example/index.html diff --git a/escheduler-ui/src/lib/@vue/crontab/example/index.js b/dolphinscheduler-ui/src/lib/@vue/crontab/example/index.js similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/example/index.js rename to dolphinscheduler-ui/src/lib/@vue/crontab/example/index.js diff --git a/escheduler-ui/src/lib/@vue/crontab/package.json b/dolphinscheduler-ui/src/lib/@vue/crontab/package.json similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/package.json rename to dolphinscheduler-ui/src/lib/@vue/crontab/package.json diff --git a/escheduler-ui/src/lib/@vue/crontab/postcss.config.js b/dolphinscheduler-ui/src/lib/@vue/crontab/postcss.config.js similarity index 100% rename from escheduler-ui/src/lib/@vue/crontab/postcss.config.js rename to dolphinscheduler-ui/src/lib/@vue/crontab/postcss.config.js diff --git a/escheduler-ui/src/lib/external/config.js b/dolphinscheduler-ui/src/lib/external/config.js similarity index 100% rename from escheduler-ui/src/lib/external/config.js rename to dolphinscheduler-ui/src/lib/external/config.js diff --git a/escheduler-ui/src/lib/external/email.js b/dolphinscheduler-ui/src/lib/external/email.js similarity index 100% rename from escheduler-ui/src/lib/external/email.js rename to dolphinscheduler-ui/src/lib/external/email.js diff --git a/escheduler-ui/src/sass/common/_animation.scss b/dolphinscheduler-ui/src/sass/common/_animation.scss similarity index 100% rename from escheduler-ui/src/sass/common/_animation.scss rename to dolphinscheduler-ui/src/sass/common/_animation.scss diff --git a/escheduler-ui/src/sass/common/_font.scss b/dolphinscheduler-ui/src/sass/common/_font.scss similarity index 100% rename from escheduler-ui/src/sass/common/_font.scss rename to dolphinscheduler-ui/src/sass/common/_font.scss diff --git a/escheduler-ui/src/sass/common/_mixin.scss b/dolphinscheduler-ui/src/sass/common/_mixin.scss similarity index 100% rename from escheduler-ui/src/sass/common/_mixin.scss rename to dolphinscheduler-ui/src/sass/common/_mixin.scss diff --git a/escheduler-ui/src/sass/common/_normalize.scss b/dolphinscheduler-ui/src/sass/common/_normalize.scss similarity index 100% rename from escheduler-ui/src/sass/common/_normalize.scss rename to dolphinscheduler-ui/src/sass/common/_normalize.scss diff --git a/escheduler-ui/src/sass/common/_scrollbar.scss b/dolphinscheduler-ui/src/sass/common/_scrollbar.scss similarity index 100% rename from escheduler-ui/src/sass/common/_scrollbar.scss rename to dolphinscheduler-ui/src/sass/common/_scrollbar.scss diff --git a/escheduler-ui/src/sass/common/_table.scss b/dolphinscheduler-ui/src/sass/common/_table.scss similarity index 100% rename from escheduler-ui/src/sass/common/_table.scss rename to dolphinscheduler-ui/src/sass/common/_table.scss diff --git a/escheduler-ui/src/sass/common/index.scss b/dolphinscheduler-ui/src/sass/common/index.scss similarity index 100% rename from escheduler-ui/src/sass/common/index.scss rename to dolphinscheduler-ui/src/sass/common/index.scss diff --git a/escheduler-ui/src/sass/conf/home/index.scss b/dolphinscheduler-ui/src/sass/conf/home/index.scss similarity index 100% rename from escheduler-ui/src/sass/conf/home/index.scss rename to dolphinscheduler-ui/src/sass/conf/home/index.scss diff --git a/escheduler-ui/src/sass/conf/login/index.scss b/dolphinscheduler-ui/src/sass/conf/login/index.scss similarity index 100% rename from escheduler-ui/src/sass/conf/login/index.scss rename to dolphinscheduler-ui/src/sass/conf/login/index.scss diff --git a/escheduler-ui/src/view/common/meta.inc b/dolphinscheduler-ui/src/view/common/meta.inc similarity index 100% rename from escheduler-ui/src/view/common/meta.inc rename to dolphinscheduler-ui/src/view/common/meta.inc diff --git a/escheduler-ui/src/view/common/outro.inc b/dolphinscheduler-ui/src/view/common/outro.inc similarity index 100% rename from escheduler-ui/src/view/common/outro.inc rename to dolphinscheduler-ui/src/view/common/outro.inc diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook-plugin-livereload/plugin.js b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook-plugin-livereload/plugin.js similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook-plugin-livereload/plugin.js rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook-plugin-livereload/plugin.js diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook.js b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook.js similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook.js rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/gitbook.js diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/gitbook/theme.js b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/theme.js similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/gitbook/theme.js rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/gitbook/theme.js diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/addtenant.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/addtenant.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/addtenant.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/addtenant.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/auth_project.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/auth_project.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/auth_project.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/auth_project.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/auth_user.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/auth_user.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/auth_user.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/auth_user.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/complement_data.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/complement_data.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/complement_data.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/complement_data.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/definition_create.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_create.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/definition_create.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_create.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/definition_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/definition_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/definition_list.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_list.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/definition_list.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/definition_list.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_1.jpg b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_1.jpg similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_1.jpg rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_1.jpg diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_2.jpg b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_2.jpg similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_2.jpg rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_2.jpg diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit3.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit3.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit3.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit3.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit4.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit4.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit4.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/dependent_edit4.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/file_create.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_create.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/file_create.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_create.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/file_detail.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_detail.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/file_detail.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_detail.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/file_rename.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_rename.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/file_rename.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_rename.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/file_upload.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_upload.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/file_upload.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/file_upload.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/flink_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/flink_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/flink_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/flink_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/gantt.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/gantt.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/gantt.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/gantt.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/global_parameter.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/global_parameter.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/global_parameter.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/global_parameter.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/hive_edit2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/local_parameter.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/local_parameter.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/local_parameter.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/local_parameter.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/login.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/login.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/login.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/login.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/logout.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/logout.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/logout.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/logout.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/mail_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mail_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/mail_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mail_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/master.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/master.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/master.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/master.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/mr_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mr_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/mr_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mr_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/mr_java.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mr_java.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/mr_java.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mr_java.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/mysql_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mysql_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/mysql_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/mysql_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/postgresql_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/postgresql_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/postgresql_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/postgresql_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/procedure_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/procedure_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/procedure_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/procedure_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/process_instance.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/process_instance.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/process_instance.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/process_instance.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/process_instance_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/process_instance_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/process_instance_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/process_instance_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/project_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/project_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/project_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/project_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/project_index.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/project_index.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/project_index.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/project_index.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/python_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/python_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/python_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/python_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/scheduler.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/scheduler.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/scheduler.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/scheduler.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/scheduler2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/scheduler2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/scheduler2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/scheduler2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/shell_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/shell_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/shell_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/shell_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/spark_datesource.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/spark_datesource.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/spark_datesource.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/spark_datesource.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/spark_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/spark_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/spark_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/spark_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/sql_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/sql_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/sql_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/sql_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_from_current2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/start_process.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_process.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/start_process.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/start_process.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/subprocess_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/subprocess_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/subprocess_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/subprocess_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/task_history.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_history.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/task_history.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_history.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/task_list.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_list.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/task_list.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_list.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/task_log.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_log.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/task_log.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_log.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/task_log2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_log2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/task_log2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/task_log2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_DEPENDENT.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_DEPENDENT.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_DEPENDENT.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_DEPENDENT.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_MR.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_MR.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_MR.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_MR.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PROCEDURE.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PROCEDURE.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PROCEDURE.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PROCEDURE.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PYTHON.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PYTHON.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PYTHON.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_PYTHON.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SHELL.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SHELL.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SHELL.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SHELL.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SPARK.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SPARK.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SPARK.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SPARK.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SQL.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SQL.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SQL.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SQL.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SUB_PROCESS.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SUB_PROCESS.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SUB_PROCESS.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/toolbar_SUB_PROCESS.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/tree_view.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/tree_view.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/tree_view.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/tree_view.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/udf_edit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/udf_edit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/udf_edit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/udf_edit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/user_manager.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/user_manager.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/user_manager.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/user_manager.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/useredit.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/useredit.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/useredit.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/useredit.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/useredit2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/useredit2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/useredit2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/useredit2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/userinfo.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/userinfo.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/userinfo.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/userinfo.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/variable_view.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/variable_view.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/variable_view.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/variable_view.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/variable_view2.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/variable_view2.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/variable_view2.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/variable_view2.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/images/worker.png b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/worker.png similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/images/worker.png rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/images/worker.png diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/index.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/index.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/index.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/index.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-background.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-foreground.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-foreground.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-foreground.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/deploy-foreground.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/pages/development.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/development.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/pages/development.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/development.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/pages/guide-architecture.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/guide-architecture.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/pages/guide-architecture.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/guide-architecture.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/pages/guide-manual.html b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/guide-manual.html similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/pages/guide-manual.html rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/pages/guide-manual.html diff --git a/escheduler-ui/src/view/docs/zh_CN/_book/search_index.json b/dolphinscheduler-ui/src/view/docs/zh_CN/_book/search_index.json similarity index 100% rename from escheduler-ui/src/view/docs/zh_CN/_book/search_index.json rename to dolphinscheduler-ui/src/view/docs/zh_CN/_book/search_index.json diff --git a/escheduler-ui/src/view/home/index.html b/dolphinscheduler-ui/src/view/home/index.html similarity index 100% rename from escheduler-ui/src/view/home/index.html rename to dolphinscheduler-ui/src/view/home/index.html diff --git a/escheduler-ui/src/view/login/index.html b/dolphinscheduler-ui/src/view/login/index.html similarity index 100% rename from escheduler-ui/src/view/login/index.html rename to dolphinscheduler-ui/src/view/login/index.html diff --git a/package.xml b/package.xml index 153dceec9b..a4ed5abe07 100644 --- a/package.xml +++ b/package.xml @@ -11,7 +11,7 @@ - escheduler-server/target/escheduler-server-${project.version} + dolphinscheduler-server/target/dolphinscheduler-server-${project.version} **/*.* @@ -19,7 +19,7 @@ - escheduler-api/target/escheduler-api-${project.version} + dolphinscheduler-api/target/dolphinscheduler-api-${project.version} **/*.* @@ -27,7 +27,7 @@ - escheduler-alert/target/escheduler-alert-${project.version} + dolphinscheduler-alert/target/dolphinscheduler-alert-${project.version} **/*.* @@ -35,7 +35,7 @@ - escheduler-ui/dist + dolphinscheduler-ui/dist **/*.* @@ -72,7 +72,7 @@ start-all.sh stop-all.sh - escheduler-daemon.sh + dolphinscheduler-daemon.sh ./bin diff --git a/pom.xml b/pom.xml index d21714a6cc..0fd2ba1bc8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ 4.0.0 - cn.analysys - escheduler + org.apache.dolphinscheduler + dolphinscheduler 1.1.0-SNAPSHOT pom - escheduler + dolphinscheduler http://maven.apache.org @@ -143,33 +143,33 @@ - cn.analysys - escheduler-server + org.apache.dolphinscheduler + dolphinscheduler-server ${project.version} - cn.analysys - escheduler-common + org.apache.dolphinscheduler + dolphinscheduler-common ${project.version} - cn.analysys - escheduler-dao + org.apache.dolphinscheduler + dolphinscheduler-dao ${project.version} - cn.analysys - escheduler-api + org.apache.dolphinscheduler + dolphinscheduler-api ${project.version} - cn.analysys - escheduler-rpc + org.apache.dolphinscheduler + dolphinscheduler-rpc ${project.version} - cn.analysys - escheduler-alert + org.apache.dolphinscheduler + dolphinscheduler-alert ${project.version} @@ -511,12 +511,12 @@ - escheduler-server - escheduler-common - escheduler-api - escheduler-dao - escheduler-alert - escheduler-rpc + dolphinscheduler-server + dolphinscheduler-common + dolphinscheduler-api + dolphinscheduler-dao + dolphinscheduler-alert + dolphinscheduler-rpc diff --git a/script/create-escheduler.sh b/script/create-dolphinscheduler.sh similarity index 100% rename from script/create-escheduler.sh rename to script/create-dolphinscheduler.sh diff --git a/script/escheduler-daemon.sh b/script/dolphinscheduler-daemon.sh similarity index 100% rename from script/escheduler-daemon.sh rename to script/dolphinscheduler-daemon.sh diff --git a/script/upgrade-escheduler.sh b/script/upgrade-dolphinscheduler.sh similarity index 100% rename from script/upgrade-escheduler.sh rename to script/upgrade-dolphinscheduler.sh