Console Output
+ git merge --ff appng-manager-1.14.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/job/PlatformEventReportJob.java
Merge made by the 'recursive' strategy.
README.adoc | 6 +-
application-home/application.xml | 19 +-
application-home/beans.xml | 27 +-
application-home/conf/config.xml | 1 +
application-home/conf/datasources/ds-sites.xml | 2 +-
application-home/conf/datasources/ds-subjects.xml | 2 +-
application-home/conf/pages/pg-system.xml | 1 +
.../dictionary/manager-messages.properties | 4 +
.../dictionary/manager-messages_de.properties | 1 +
license-header.txt | 2 +-
pom.xml | 4 +-
src/main/asciidoc/appng-manager-userguide.adoc | 3 +-
src/main/asciidoc/parts/jobs.adoc | 80 +++++
src/main/asciidoc/parts/platform.adoc | 6 +-
src/main/asciidoc/parts/system.adoc | 2 +-
.../application/manager/business/Applications.java | 10 +-
.../appng/application/manager/business/Beans.java | 2 +-
.../appng/application/manager/business/Cache.java | 8 +-
.../application/manager/business/ClusterState.java | 2 +-
.../manager/business/DatabaseConnections.java | 8 +-
.../application/manager/business/Dictionary.java | 6 +-
.../application/manager/business/Environment.java | 2 +-
.../application/manager/business/GrantSites.java | 2 +-
.../appng/application/manager/business/Groups.java | 8 +-
.../application/manager/business/Installation.java | 10 +-
.../appng/application/manager/business/Jars.java | 2 +-
.../application/manager/business/LogConfig.java | 2 +-
.../manager/business/LogConfigChangedEvent.java | 2 +-
.../application/manager/business/Permissions.java | 8 +-
.../manager/business/PlatformEvents.java | 7 +-
.../application/manager/business/Properties.java | 8 +-
.../application/manager/business/Repositories.java | 16 +-
.../application/manager/business/Resources.java | 8 +-
.../appng/application/manager/business/Roles.java | 6 +-
.../application/manager/business/Sessions.java | 32 +-
.../appng/application/manager/business/Sites.java | 12 +-
.../application/manager/business/SqlExecutor.java | 2 +-
.../application/manager/business/Subjects.java | 10 +-
.../application/manager/business/Templates.java | 4 +-
.../appng/application/manager/business/Upload.java | 4 +-
.../manager/business/webservice/Constants.java | 2 +-
.../business/webservice/FastAccessFile.java | 2 +-
.../manager/business/webservice/LogViewer.java | 2 +-
.../manager/business/webservice/SystemReport.java | 2 +-
.../manager/business/webservice/ThreadViewer.java | 2 +-
.../appng/application/manager/form/GrantForm.java | 2 +-
.../appng/application/manager/form/GroupForm.java | 2 +-
.../manager/form/PackageUploadForm.java | 2 +-
.../application/manager/form/PropertyForm.java | 2 +-
.../application/manager/form/RepositoryForm.java | 2 +-
.../application/manager/form/ResourceForm.java | 2 +-
.../appng/application/manager/form/RoleForm.java | 2 +-
.../appng/application/manager/form/SiteForm.java | 2 +-
.../application/manager/form/SubjectForm.java | 2 +-
.../appng/application/manager/form/UploadForm.java | 2 +-
.../application/manager/job/DatabaseReportJob.java | 78 ++++
.../application/manager/job/LogDatabaseSize.java | 85 +++++
.../manager/{ => job}/PlatformEventReportJob.java | 79 ++---
.../application/manager/job/ReportJobBase.java | 109 ++++++
.../manager/service/ManagerService.java | 392 +++++++++++----------
.../manager/service/PlatformEventService.java | 14 +-
.../application/manager/service/RoleService.java | 53 +++
.../appng/application/manager/service/Service.java | 128 +++----
.../application/manager/service/ServiceAware.java | 2 +-
.../manager/soap/endpoint/RepositoryService.java | 29 +-
.../application/manager/business/AbstractTest.java | 6 +-
.../business/ApplicationPropertiesTest.java | 2 +-
.../manager/business/ClusterStateTest.java | 2 +-
.../manager/business/DataBaseConnectionsTest.java | 2 +-
.../application/manager/business/GroupsTest.java | 14 +-
.../manager/business/PermissionsTest.java | 2 +-
.../manager/business/PlatformEventsTest.java | 2 +-
.../manager/business/PlatformPropertiesTest.java | 2 +-
.../manager/business/RepositoriesTest.java | 2 +-
.../application/manager/business/RoleTest.java | 2 +-
.../application/manager/business/SessionsTest.java | 2 +-
.../manager/business/SitePropertiesTest.java | 2 +-
.../application/manager/business/SitesTest.java | 5 +-
.../manager/business/SqlExecutorTest.java | 2 +-
.../application/manager/business/SubjectsTest.java | 2 +-
.../manager/business/webservice/LogViewerTest.java | 6 +-
.../manager/job/DatabaseReportJobTest.java | 52 +++
src/test/resources/log4j.properties | 18 +-
.../xml/GroupsTest-testUpdateAdminGroup-action.xml | 74 ++++
.../GroupsTest-testUpdateAdminGroup-messages.xml | 4 +
.../xml/SessionsTest-testShowSessions.xml | 341 +++++++++---------
.../xml/SessionsTest-testShowSessionsFiltered.xml | 22 +-
src/test/resources/xml/SitesTest-testShowSites.xml | 335 +++++++++---------
.../resources/xml/SubjectsTest-testShowAll.xml | 219 ++++++------
89 files changed, 1519 insertions(+), 941 deletions(-)
create mode 100644 src/main/asciidoc/parts/jobs.adoc
create mode 100644 src/main/java/org/appng/application/manager/job/DatabaseReportJob.java
create mode 100644 src/main/java/org/appng/application/manager/job/LogDatabaseSize.java
rename src/main/java/org/appng/application/manager/{ => job}/PlatformEventReportJob.java (50%)
create mode 100644 src/main/java/org/appng/application/manager/job/ReportJobBase.java
create mode 100644 src/main/java/org/appng/application/manager/service/RoleService.java
create mode 100644 src/test/java/org/appng/application/manager/job/DatabaseReportJobTest.java
create mode 100644 src/test/resources/xml/GroupsTest-testUpdateAdminGroup-action.xml
create mode 100644 src/test/resources/xml/GroupsTest-testUpdateAdminGroup-messages.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
