You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/07/21 03:53:08 UTC
[shardingsphere-elasticjob] branch master updated (e61905b ->
662e8fc)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git.
from e61905b Merge spring boot starter to one module (#1203)
new db1d01c Use spring boot instead of jetty for cloud console
new 5029b0d Merge branch 'master' of github.com:apache/shardingsphere-elasticjob-lite into 1050
new 398f64d add unit test for cloud console.
new f513d2c Merge branch 'master' of github.com:apache/shardingsphere-elasticjob-lite into 1050
new f7d907c add unit test for cloud console.
new 94e7c2e add unit test for cloud console.
new 662e8fc Merge pull request #1171 from kekerzzZ/1050
The 1819 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../elasticjob-cloud-scheduler/pom.xml | 56 ++++-
.../elasticjob/cloud/console/ConsoleBootstrap.java | 92 ++++++++
.../console/config/FilterRegisterConfig.java | 27 +--
.../cloud}/console/config/WebMvcConfig.java | 2 +-
.../config/advice/ConsoleRestControllerAdvice.java | 3 +-
.../controller/CloudAppController.java} | 98 ++++-----
.../controller/CloudJobController.java} | 237 ++++++++-------------
.../controller/CloudOperationController.java} | 39 ++--
.../controller}/search/JobEventRdbSearch.java | 15 +-
.../console/security/AuthenticationResult.java | 2 +-
.../security/UserAuthenticationService.java | 57 +++++
.../cloud}/console/security/WwwAuthFilter.java | 46 ++--
.../elasticjob/cloud/restful/GsonJsonProvider.java | 82 -------
.../elasticjob/cloud/restful/RestfulException.java | 30 ---
.../cloud/restful/RestfulExceptionMapper.java | 37 ----
.../elasticjob/cloud/restful/RestfulServer.java | 124 -----------
.../cloud/scheduler/env/BootstrapEnvironment.java | 2 +-
.../cloud/scheduler/mesos/MesosStateService.java | 34 ++-
.../cloud/scheduler/mesos/SchedulerService.java | 13 +-
.../cloud/scheduler/restful/RestfulService.java | 64 ------
.../auth.properties => application.properties} | 12 +-
.../src/main/resources/assembly/assembly.xml | 10 +
.../src/main/resources/bin/start.sh | 2 +-
.../main/resources/console/js/app/app_common.js | 2 +-
.../main/resources/console/js/app/apps_overview.js | 1 +
.../main/resources/console/js/job/job_common.js | 4 +-
.../main/resources/console/js/job/jobs_overview.js | 5 +-
.../AbstractCloudControllerTest.java} | 38 ++--
.../elasticjob/cloud/console/HttpTestsUtil.java | 128 +++++++++++
.../controller/CloudAppControllerTest.java} | 38 ++--
.../controller/CloudJobControllerTest.java} | 130 ++++-------
.../controller/CloudOperationControllerTest.java} | 28 ++-
.../cloud/restful/RestfulExceptionTest.java | 31 ---
.../cloud/restful/RestfulServerTest.java | 102 ---------
.../elasticjob/cloud/restful/fixture/Caller.java | 33 ---
.../cloud/restful/fixture/TestFilter.java | 46 ----
.../cloud/restful/fixture/TestRestfulApi.java | 48 -----
.../scheduler/fixture/CloudJsonConstants.java | 13 +-
.../scheduler/mesos/MesosStateServiceTest.java | 15 +-
.../scheduler/mesos/SchedulerServiceTest.java | 22 +-
.../fixture/master/MesosMasterServerMock.java | 26 +--
.../master/MesosMasterServerMockConfiguration.java | 25 ++-
.../mesos/fixture/slave/MesosSlaveServerMock.java | 26 +--
.../slave/MesosSlaveServerMockConfiguration.java | 25 ++-
.../cloud/scheduler/restful/RestfulTestsUtil.java | 98 ---------
45 files changed, 728 insertions(+), 1240 deletions(-)
create mode 100644 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/ConsoleBootstrap.java
copy {elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite => elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud}/console/config/FilterRegisterConfig.java (68%)
copy {elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite => elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud}/console/config/WebMvcConfig.java (96%)
copy {elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite => elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud}/console/config/advice/ConsoleRestControllerAdvice.java (96%)
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudAppRestfulApi.java => console/controller/CloudAppController.java} (76%)
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudJobRestfulApi.java => console/controller/CloudJobController.java} (69%)
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudOperationRestfulApi.java => console/controller/CloudOperationController.java} (74%)
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful => console/controller}/search/JobEventRdbSearch.java (99%)
copy {elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite => elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud}/console/security/AuthenticationResult.java (94%)
create mode 100644 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/security/UserAuthenticationService.java
copy {elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite => elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud}/console/security/WwwAuthFilter.java (78%)
mode change 100644 => 100755
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/restful/GsonJsonProvider.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulException.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionMapper.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServer.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/RestfulService.java
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/main/resources/{conf/auth.properties => application.properties} (82%)
mode change 100755 => 100644
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/AbstractCloudRestfulApiTest.java => console/AbstractCloudControllerTest.java} (67%)
mode change 100755 => 100644
create mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/console/HttpTestsUtil.java
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudAppRestfulApiTest.java => console/controller/CloudAppControllerTest.java} (73%)
mode change 100755 => 100644
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudJobRestfulApiTest.java => console/controller/CloudJobControllerTest.java} (60%)
mode change 100755 => 100644
rename elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/{scheduler/restful/CloudOperationRestfulApiTest.java => console/controller/CloudOperationControllerTest.java} (57%)
mode change 100755 => 100644
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulExceptionTest.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/RestfulServerTest.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/fixture/Caller.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/fixture/TestFilter.java
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/restful/fixture/TestRestfulApi.java
copy elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/ConsoleBootstrap.java => elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/fixture/master/MesosMasterServerMockConfiguration.java (62%)
copy elasticjob-lite/elasticjob-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/ConsoleBootstrap.java => elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/fixture/slave/MesosSlaveServerMockConfiguration.java (63%)
delete mode 100755 elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/restful/RestfulTestsUtil.java