Console Output
[appng-manager] Running shell script
+ git merge --ff appng-manager-1.13.x --strategy-option theirs
Auto-merging src/test/java/org/appng/application/manager/business/webservice/LogViewerTest.java
Auto-merging src/main/java/org/appng/application/manager/business/webservice/ThreadViewer.java
Auto-merging src/main/java/org/appng/application/manager/business/webservice/SystemReport.java
Auto-merging src/main/java/org/appng/application/manager/business/webservice/LogViewer.java
Auto-merging src/main/java/org/appng/application/manager/business/webservice/FastAccessFile.java
Auto-merging src/main/java/org/appng/application/manager/business/webservice/Constants.java
Merge made by the 'recursive' strategy.
CONTRIBUTING.adoc | 4 +
README.adoc | 9 +-
application-home/application.xml | 7 +
application-home/beans.xml | 17 +-
application-home/conf/config.xml | 16 ++
.../conf/datasources/ds-connections.xml | 41 +++-
.../conf/datasources/ds-platformEvents.xml | 72 ++++++
.../conf/datasources/ds-properties.xml | 12 +-
.../conf/datasources/ds-repositories.xml | 19 +-
application-home/conf/datasources/ds-sites.xml | 1 -
application-home/conf/pages/pg-platform.xml | 28 +++
application-home/conf/pages/pg-repositories.xml | 2 +-
application-home/conf/pages/pg-sites.xml | 11 +-
.../dictionary/manager-messages.properties | 28 ++-
.../dictionary/manager-messages_de.properties | 3 +-
license-header.txt | 2 +-
pom.xml | 72 ++++--
src/main/asciidoc/parts/site-properties.adoc | 11 +-
src/main/asciidoc/parts/users-and-groups.adoc | 39 ++-
.../manager/PlatformEventReportJob.java | 120 ++++++++++
.../manager/builder/OptionsBuilder.java | 114 +++++++++
.../manager/builder/SelectionBuilder.java | 101 ++++++++
.../application/manager/business/Applications.java | 11 +-
.../appng/application/manager/business/Beans.java | 2 +-
.../appng/application/manager/business/Cache.java | 2 +-
.../application/manager/business/ClusterState.java | 25 +-
.../manager/business/DatabaseConnections.java | 21 +-
.../application/manager/business/Dictionary.java | 2 +-
.../application/manager/business/Environment.java | 9 +-
.../application/manager/business/GrantSites.java | 2 +-
.../appng/application/manager/business/Groups.java | 9 +-
.../application/manager/business/Installation.java | 11 +-
.../appng/application/manager/business/Jars.java | 2 +-
.../application/manager/business/LogConfig.java | 10 +-
.../manager/business/LogConfigChangedEvent.java | 2 +-
.../application/manager/business/Permissions.java | 8 +-
.../manager/business/PlatformEvents.java | 160 +++++++++++++
.../application/manager/business/Properties.java | 13 +-
.../application/manager/business/Repositories.java | 9 +-
.../application/manager/business/Resources.java | 9 +-
.../appng/application/manager/business/Roles.java | 8 +-
.../application/manager/business/Sessions.java | 4 +-
.../appng/application/manager/business/Sites.java | 8 +-
.../application/manager/business/SqlExecutor.java | 3 +-
.../application/manager/business/Subjects.java | 9 +-
.../application/manager/business/Templates.java | 2 +-
.../appng/application/manager/business/Upload.java | 9 +-
.../business/{ => webservice}/Constants.java | 4 +-
.../business/{ => webservice}/FastAccessFile.java | 18 +-
.../business/{ => webservice}/LogViewer.java | 4 +-
.../business/webservice/PlatformEventExport.java | 146 +++++++++++
.../business/{ => webservice}/SystemReport.java | 36 ++-
.../business/{ => webservice}/ThreadViewer.java | 4 +-
.../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 +-
.../manager/service/ManagerService.java | 106 ++++----
.../manager/service/PlatformEventService.java | 73 ++++++
.../appng/application/manager/service/Service.java | 5 +-
.../application/manager/service/ServiceAware.java | 2 +-
.../manager/soap/endpoint/RepositoryService.java | 2 +-
.../application/manager/business/AbstractTest.java | 2 +-
.../business/ApplicationPropertiesTest.java | 4 +-
.../manager/business/ClusterStateTest.java | 2 +-
.../manager/business/DataBaseConnectionsTest.java | 44 ++++
.../application/manager/business/GroupsTest.java | 2 +-
.../manager/business/PermissionsTest.java | 2 +-
.../manager/business/PlatformEventsTest.java | 38 +++
.../manager/business/PlatformPropertiesTest.java | 4 +-
.../manager/business/RepositoriesTest.java | 2 +-
.../application/manager/business/RoleTest.java | 2 +-
.../application/manager/business/SessionsTest.java | 22 +-
.../manager/business/SitePropertiesTest.java | 4 +-
.../application/manager/business/SitesTest.java | 2 +-
.../manager/business/SqlExecutorTest.java | 8 +-
.../application/manager/business/SubjectsTest.java | 2 +-
.../business/{ => webservice}/LogViewerTest.java | 5 +-
.../xml/ApplicationPropertiesTest-testShowAll.xml | 4 +-
.../xml/ClusterStateTest-testClusterState.xml | 4 +-
.../xml/DataBaseConnectionsTest-testMigrations.xml | 266 +++++++++++++++++++++
.../xml/DataBaseConnectionsTest-testOverview.xml | 93 +++++++
.../resources/xml/GroupsTest-testShowGroups.xml | 2 +-
.../xml/PermissionsTest-testShowPermissions.xml | 2 +-
.../xml/PlatformEventsTest-testShowAll.xml | 87 +++++++
.../xml/PlatformPropertiesTest-testShowAll.xml | 4 +-
...epositoriesTest-testCreateRepository-action.xml | 2 +-
...sitoriesTest-testCreateRepositoryNameExists.xml | 2 +-
.../xml/RepositoriesTest-testShowRepositories.xml | 4 +-
.../xml/RepositoriesTest-testShowRepository.xml | 2 +-
...epositoriesTest-testUpdateRepository-action.xml | 2 +-
src/test/resources/xml/RoleTest-testShowAll.xml | 2 +-
.../xml/SessionsTest-testShowSessions.xml | 2 +-
.../xml/SessionsTest-testShowSessionsFiltered.xml | 137 +++++++++++
.../xml/SitePropertiesTest-testShowAll.xml | 4 +-
.../xml/SitesTest-testCreateSite-action.xml | 2 +-
.../xml/SitesTest-testCreateSiteValidationFail.xml | 2 +-
src/test/resources/xml/SitesTest-testShowSite.xml | 2 +-
src/test/resources/xml/SitesTest-testShowSites.xml | 5 +-
.../resources/xml/SubjectsTest-testShowAll.xml | 2 +-
106 files changed, 1981 insertions(+), 295 deletions(-)
create mode 100644 application-home/conf/datasources/ds-platformEvents.xml
create mode 100644 src/main/java/org/appng/application/manager/PlatformEventReportJob.java
create mode 100644 src/main/java/org/appng/application/manager/builder/OptionsBuilder.java
create mode 100644 src/main/java/org/appng/application/manager/builder/SelectionBuilder.java
create mode 100644 src/main/java/org/appng/application/manager/business/PlatformEvents.java
rename src/main/java/org/appng/application/manager/business/{ => webservice}/Constants.java (84%)
rename src/main/java/org/appng/application/manager/business/{ => webservice}/FastAccessFile.java (85%)
rename src/main/java/org/appng/application/manager/business/{ => webservice}/LogViewer.java (96%)
create mode 100644 src/main/java/org/appng/application/manager/business/webservice/PlatformEventExport.java
rename src/main/java/org/appng/application/manager/business/{ => webservice}/SystemReport.java (90%)
rename src/main/java/org/appng/application/manager/business/{ => webservice}/ThreadViewer.java (96%)
create mode 100644 src/main/java/org/appng/application/manager/service/PlatformEventService.java
create mode 100644 src/test/java/org/appng/application/manager/business/DataBaseConnectionsTest.java
create mode 100644 src/test/java/org/appng/application/manager/business/PlatformEventsTest.java
rename src/test/java/org/appng/application/manager/business/{ => webservice}/LogViewerTest.java (91%)
create mode 100644 src/test/resources/xml/DataBaseConnectionsTest-testMigrations.xml
create mode 100644 src/test/resources/xml/DataBaseConnectionsTest-testOverview.xml
create mode 100644 src/test/resources/xml/PlatformEventsTest-testShowAll.xml
create mode 100644 src/test/resources/xml/SessionsTest-testShowSessionsFiltered.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
