Console Output
+ git merge --ff appng-manager-1.20.x --strategy-option theirs
Auto-merging src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
Auto-merging src/test/resources/xml/SitesTest-testShowSites.xml
Auto-merging src/test/java/org/appng/application/manager/business/CacheTest.java
Auto-merging src/main/java/org/appng/application/manager/service/Service.java
Auto-merging src/main/java/org/appng/application/manager/service/ManagerService.java
Auto-merging src/main/java/org/appng/application/manager/business/Sites.java
Auto-merging src/main/java/org/appng/application/manager/business/Sessions.java
Auto-merging src/main/java/org/appng/application/manager/business/LdapUsers.java
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Auto-merging changelog.txt
Auto-merging application-home/dictionary/manager-messages.properties
Auto-merging application-home/conf/pages/pg-sites.xml
Auto-merging application-home/conf/datasources/ds-sites.xml
Merge made by the 'recursive' strategy.
.gitignore | 1 +
README.adoc | 6 +-
.../conf/datasources/ds-connections.xml | 18 +-
application-home/conf/datasources/ds-logconfig.xml | 2 +-
application-home/conf/datasources/ds-sites.xml | 26 +-
application-home/conf/datasources/ds-subjects.xml | 5 +-
application-home/conf/pages/pg-platform.xml | 24 +-
application-home/conf/pages/pg-sites.xml | 33 +-
application-home/conf/pages/pg-subjects.xml | 1 -
.../dictionary/manager-messages.properties | 9 +-
.../dictionary/manager-messages_de.properties | 7 +-
changelog.txt | 39 +-
license-header.txt | 2 +-
pom.xml | 10 +-
.../application/manager/business/Applications.java | 2 +-
.../appng/application/manager/business/Beans.java | 2 +-
.../appng/application/manager/business/Cache.java | 6 +-
.../application/manager/business/ClusterState.java | 2 +-
.../manager/business/DatabaseConnections.java | 4 +-
.../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 | 2 +-
.../appng/application/manager/business/Jars.java | 2 +-
.../application/manager/business/LdapUsers.java | 2 +-
.../application/manager/business/LogConfig.java | 45 +--
.../manager/business/LogConfigChangedEvent.java | 31 +-
.../appng/application/manager/business/Mailer.java | 2 +-
.../application/manager/business/Permissions.java | 2 +-
.../manager/business/PlatformEvents.java | 2 +-
.../application/manager/business/Properties.java | 2 +-
.../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 | 3 +-
.../appng/application/manager/business/Sites.java | 14 +-
.../application/manager/business/SqlExecutor.java | 2 +-
.../application/manager/business/Subjects.java | 5 +-
.../application/manager/business/Templates.java | 2 +-
.../manager/business/webservice/Constants.java | 2 +-
.../business/webservice/FastAccessFile.java | 2 +-
.../manager/business/webservice/LogViewer.java | 34 +-
.../business/webservice/PlatformEventExport.java | 2 +-
.../manager/business/webservice/SystemReport.java | 2 +-
.../manager/business/webservice/ThreadViewer.java | 2 +-
.../manager/form/DatabaseConnectionForm.java | 30 +-
.../appng/application/manager/form/GrantForm.java | 2 +-
.../appng/application/manager/form/GroupForm.java | 2 +-
.../appng/application/manager/form/MailForm.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 | 42 +-
.../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 | 66 ++--
.../manager/service/PlatformEventService.java | 2 +-
.../application/manager/service/RoleService.java | 2 +-
.../appng/application/manager/service/Service.java | 6 +-
.../application/manager/service/ServiceAware.java | 2 +-
.../manager/soap/endpoint/RepositoryService.java | 2 +-
.../application/manager/business/AbstractTest.java | 2 +-
.../business/ApplicationPropertiesTest.java | 2 +-
.../application/manager/business/CacheTest.java | 2 +-
.../manager/business/ClusterStateTest.java | 2 +-
.../manager/business/DataBaseConnectionsTest.java | 2 +-
.../manager/business/EnvironmentTest.java | 2 +-
.../application/manager/business/GroupsTest.java | 2 +-
.../manager/business/LdapUsersTest.java | 2 +-
.../application/manager/business/MailTest.java | 2 +-
.../manager/business/NodePropertiesTest.java | 2 +-
.../manager/business/PermissionsTest.java | 2 +-
.../manager/business/PlatformEventsTest.java | 2 +-
.../manager/business/PlatformPropertiesTest.java | 2 +-
.../manager/business/RepositoriesTest.java | 7 +-
.../application/manager/business/RoleTest.java | 2 +-
.../application/manager/business/SessionsTest.java | 2 +-
.../manager/business/SessionsTestBean.java | 2 +-
.../manager/business/SitePropertiesTest.java | 2 +-
.../application/manager/business/SitesTest.java | 145 +++++--
.../manager/business/SqlExecutorTest.java | 2 +-
.../application/manager/business/SubjectsTest.java | 6 +-
.../manager/business/webservice/LogViewerTest.java | 2 +-
.../manager/job/DatabaseReportJobTest.java | 2 +-
.../xml/DataBaseConnectionsTest-testMigrations.xml | 142 ++++---
.../xml/DataBaseConnectionsTest-testOverview.xml | 33 +-
src/test/resources/xml/LdapUsersTest-testUsers.xml | 45 ++-
.../xml/PlatformEventsTest-testShowAll.xml | 4 +-
.../xml/RepositoriesTest-testPackages.xml | 130 +++----
...n.xml => SitesTest-testCreateSite01-action.xml} | 8 +-
...xml => SitesTest-testCreateSite01-messages.xml} | 0
...> SitesTest-testCreateSite02ValidationFail.xml} | 8 +-
.../SitesTest-testCreateSite03NameConflictFail.xml | 113 ++++++
...SitesTest-testCreateSite03NameDuplicateFail.xml | 114 ++++++
...est-testCreateSite041Host2AliasConflictFail.xml | 113 ++++++
...Test-testCreateSite041Host2HostConflictFail.xml | 113 ++++++
...SitesTest-testCreateSite04HostDuplicateFail.xml | 114 ++++++
...est-testCreateSite051Alias2HostConflictFail.xml | 113 ++++++
...st-testCreateSite052Alias2AliasConflictFail.xml | 113 ++++++
...itesTest-testCreateSite05AliasDuplicateFail.xml | 114 ++++++
...itesTest-testCreateSite06AliasDuplicateFail.xml | 114 ++++++
src/test/resources/xml/SitesTest-testShowSite.xml | 111 +++---
src/test/resources/xml/SitesTest-testShowSites.xml | 428 ++++++++++-----------
.../xml/SitesTest-testShowSitesFiltered.xml | 341 ++++++++--------
.../resources/xml/SubjectsTest-testShowAll.xml | 1 -
.../xml/SubjectsTest-testShowAllFilterGroup.xml | 1 -
114 files changed, 2145 insertions(+), 881 deletions(-)
rename src/test/resources/xml/{SitesTest-testCreateSite-action.xml => SitesTest-testCreateSite01-action.xml} (93%)
rename src/test/resources/xml/{SitesTest-testCreateSite-messages.xml => SitesTest-testCreateSite01-messages.xml} (100%)
rename src/test/resources/xml/{SitesTest-testCreateSiteValidationFail.xml => SitesTest-testCreateSite02ValidationFail.xml} (94%)
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite03NameConflictFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite03NameDuplicateFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite041Host2AliasConflictFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite041Host2HostConflictFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite04HostDuplicateFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite051Alias2HostConflictFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite052Alias2AliasConflictFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite05AliasDuplicateFail.xml
create mode 100644 src/test/resources/xml/SitesTest-testCreateSite06AliasDuplicateFail.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
