Console Output
+ git merge --ff appng-manager-1.18.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/service/Service.java
Auto-merging src/main/java/org/appng/application/manager/business/SqlExecutor.java
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Auto-merging application-home/application.xml
Merge made by the 'recursive' strategy.
application-home/application.xml | 12 +-
.../conf/datasources/ds-applications.xml | 8 +-
application-home/conf/datasources/ds-cache.xml | 2 +-
.../conf/datasources/ds-clusterState.xml | 10 +-
.../conf/datasources/ds-connections.xml | 20 +--
.../conf/datasources/ds-environment.xml | 12 +-
application-home/conf/datasources/ds-groups.xml | 2 +-
application-home/conf/datasources/ds-ldapusers.xml | 2 +-
.../conf/datasources/ds-permissions.xml | 2 +-
.../conf/datasources/ds-properties.xml | 72 +++++++++-
.../conf/datasources/ds-repositories.xml | 12 +-
application-home/conf/datasources/ds-resources.xml | 2 +-
application-home/conf/datasources/ds-roles.xml | 2 +-
application-home/conf/datasources/ds-sites.xml | 39 +++++-
application-home/conf/datasources/ds-subjects.xml | 2 +-
application-home/conf/datasources/ds-templates.xml | 2 +-
application-home/conf/events/ev-properties.xml | 59 ++++++++
application-home/conf/events/ev-sites.xml | 57 +++++++-
application-home/conf/pages/pg-applications.xml | 14 +-
application-home/conf/pages/pg-platform.xml | 13 +-
application-home/conf/pages/pg-repositories.xml | 12 +-
application-home/conf/pages/pg-sites.xml | 61 ++++++---
application-home/conf/pages/pg-subjects.xml | 6 +-
application-home/conf/pages/pg-system.xml | 65 ++++++---
.../dictionary/manager-messages.properties | 21 +++
pom.xml | 19 +--
.../application/manager/business/Applications.java | 2 +-
.../appng/application/manager/business/Beans.java | 2 +-
.../appng/application/manager/business/Cache.java | 76 ++++-------
.../application/manager/business/ClusterState.java | 2 +-
.../manager/business/DatabaseConnections.java | 2 +-
.../application/manager/business/Dictionary.java | 2 +-
.../application/manager/business/Environment.java | 2 +-
.../application/manager/business/GrantSites.java | 2 +-
.../appng/application/manager/business/Groups.java | 2 +-
.../application/manager/business/Installation.java | 3 +-
.../appng/application/manager/business/Jars.java | 2 +-
.../application/manager/business/LdapUsers.java | 49 ++++---
.../application/manager/business/LogConfig.java | 2 +-
.../manager/business/LogConfigChangedEvent.java | 2 +-
.../application/manager/business/Permissions.java | 2 +-
.../manager/business/PlatformEvents.java | 2 +-
.../application/manager/business/Properties.java | 8 +-
.../application/manager/business/Repositories.java | 2 +-
.../manager/business/ResourceUpload.java | 2 +-
.../application/manager/business/Resources.java | 2 +-
.../appng/application/manager/business/Roles.java | 2 +-
.../application/manager/business/Sessions.java | 47 +++++--
.../appng/application/manager/business/Sites.java | 43 +++++-
.../application/manager/business/SqlExecutor.java | 84 ++++++------
.../application/manager/business/Subjects.java | 2 +-
.../application/manager/business/Templates.java | 2 +-
.../manager/business/webservice/Constants.java | 2 +-
.../business/webservice/FastAccessFile.java | 2 +-
.../manager/business/webservice/LogViewer.java | 2 +-
.../business/webservice/PlatformEventExport.java | 2 +-
.../manager/business/webservice/SystemReport.java | 2 +-
.../manager/business/webservice/ThreadViewer.java | 2 +-
.../manager/form/DatabaseConnectionForm.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 | 2 +-
.../application/manager/job/LogDatabaseSize.java | 2 +-
.../manager/job/PlatformEventReportJob.java | 2 +-
.../application/manager/job/ReportJobBase.java | 2 +-
.../manager/service/ManagerService.java | 145 +++++++++++++++-----
.../manager/service/PlatformEventService.java | 2 +-
.../application/manager/service/RoleService.java | 2 +-
.../appng/application/manager/service/Service.java | 31 +++--
.../application/manager/service/ServiceAware.java | 4 +-
.../manager/soap/endpoint/RepositoryService.java | 2 +-
.../application/manager/business/AbstractTest.java | 2 +-
.../business/ApplicationPropertiesTest.java | 13 +-
.../manager/business/ClusterStateTest.java | 4 +-
.../manager/business/DataBaseConnectionsTest.java | 10 +-
.../application/manager/business/GroupsTest.java | 2 +-
.../manager/business/LdapUsersTest.java | 3 +-
.../manager/business/NodePropertiesTest.java | 70 ++++++++++
.../manager/business/PermissionsTest.java | 2 +-
.../manager/business/PlatformEventsTest.java | 2 +-
.../manager/business/PlatformPropertiesTest.java | 2 +-
.../manager/business/RepositoriesTest.java | 15 ++-
.../application/manager/business/RoleTest.java | 2 +-
.../application/manager/business/SessionsTest.java | 11 +-
.../manager/business/SessionsTestBean.java | 7 +-
.../manager/business/SitePropertiesTest.java | 2 +-
.../application/manager/business/SitesTest.java | 40 +++++-
.../manager/business/SqlExecutorTest.java | 2 +-
.../application/manager/business/SubjectsTest.java | 2 +-
.../manager/business/webservice/LogViewerTest.java | 2 +-
.../xml/ApplicationPropertiesTest-testShowAll.xml | 6 +-
.../xml/ClusterStateTest-testClusterState.xml | 103 +++++++-------
.../xml/DataBaseConnectionsTest-testOverview.xml | 3 +-
.../xml/DataBaseConnectionsTest-testUpdate.xml | 140 +++++++++++++++++++
.../resources/xml/GroupsTest-testShowGroups.xml | 6 +-
.../xml/GroupsTest-testShowGroupsFilterName.xml | 4 +-
.../resources/xml/LdapUsersTest-testSettings.xml | 150 +++++++++++----------
src/test/resources/xml/LdapUsersTest-testUsers.xml | 2 +-
.../xml/NodePropertiesTest-testACreate.xml | 4 +
.../xml/NodePropertiesTest-testShowAll.xml | 89 ++++++++++++
.../xml/NodePropertiesTest-testShowOne.xml | 37 +++++
.../xml/NodePropertiesTest-testUpdate.xml | 4 +
.../xml/NodePropertiesTest-testZDelete.xml | 4 +
.../xml/PermissionsTest-testShowPermissions.xml | 6 +-
.../xml/PlatformPropertiesTest-testShowAll.xml | 12 +-
.../xml/RepositoriesTest-testPackages.xml | 69 ++++++++++
.../xml/RepositoriesTest-testShowRepositories.xml | 10 +-
src/test/resources/xml/RoleTest-testShowAll.xml | 4 +-
.../xml/SitePropertiesTest-testShowAll.xml | 8 +-
src/test/resources/xml/SitesTest-testShowSite.xml | 2 +-
src/test/resources/xml/SitesTest-testShowSites.xml | 70 +++++++---
.../xml/SitesTest-testShowSitesFiltered.xml | 47 +++++--
.../resources/xml/SubjectsTest-testShowAll.xml | 4 +-
.../xml/SubjectsTest-testShowAllFilterGroup.xml | 4 +-
122 files changed, 1524 insertions(+), 561 deletions(-)
create mode 100644 src/test/java/org/appng/application/manager/business/NodePropertiesTest.java
create mode 100644 src/test/resources/xml/DataBaseConnectionsTest-testUpdate.xml
create mode 100644 src/test/resources/xml/NodePropertiesTest-testACreate.xml
create mode 100644 src/test/resources/xml/NodePropertiesTest-testShowAll.xml
create mode 100644 src/test/resources/xml/NodePropertiesTest-testShowOne.xml
create mode 100644 src/test/resources/xml/NodePropertiesTest-testUpdate.xml
create mode 100644 src/test/resources/xml/NodePropertiesTest-testZDelete.xml
create mode 100644 src/test/resources/xml/RepositoriesTest-testPackages.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
