Console Output
+ git merge --ff appng-manager-1.17.x --strategy-option theirs
Updating cad0699..9fded19
Fast-forward
application-home/conf/datasources/ds-cache.xml | 10 -
.../conf/datasources/ds-connections.xml | 2 +-
application-home/conf/datasources/ds-ldapusers.xml | 46 +
.../conf/datasources/ds-properties.xml | 32 +-
application-home/conf/datasources/ds-subjects.xml | 18 +
application-home/conf/datasources/ds-upload.xml | 2 +-
application-home/conf/events/ev-cache.xml | 22 +-
application-home/conf/events/ev-resource.xml | 2 +-
application-home/conf/pages/pg-sites.xml | 96 +-
application-home/conf/pages/pg-subjects.xml | 18 +-
.../dictionary/manager-messages.properties | 39 +-
.../dictionary/manager-messages_de.properties | 16 +-
changelog.txt | 18 +
license-header.txt | 2 +-
pom.xml | 25 +-
src/main/asciidoc/parts/site-properties.adoc | 12 +-
src/main/asciidoc/parts/sites.adoc | 4 +-
.../application/manager/business/Applications.java | 17 +-
.../appng/application/manager/business/Beans.java | 8 +-
.../appng/application/manager/business/Cache.java | 81 +-
.../application/manager/business/ClusterState.java | 5 +-
.../manager/business/DatabaseConnections.java | 6 +-
.../application/manager/business/Dictionary.java | 13 +-
.../application/manager/business/Environment.java | 9 +-
.../application/manager/business/GrantSites.java | 14 +-
.../appng/application/manager/business/Groups.java | 9 +-
.../application/manager/business/Installation.java | 22 +-
.../appng/application/manager/business/Jars.java | 15 +-
.../application/manager/business/LdapUsers.java | 118 +++
.../application/manager/business/LogConfig.java | 6 +-
.../manager/business/LogConfigChangedEvent.java | 2 +-
.../application/manager/business/Permissions.java | 15 +-
.../manager/business/PlatformEvents.java | 8 +-
.../application/manager/business/Properties.java | 120 ++-
.../application/manager/business/Repositories.java | 11 +-
.../business/{Upload.java => ResourceUpload.java} | 42 +-
.../application/manager/business/Resources.java | 15 +-
.../appng/application/manager/business/Roles.java | 17 +-
.../application/manager/business/Sessions.java | 92 +-
.../appng/application/manager/business/Sites.java | 14 +-
.../application/manager/business/SqlExecutor.java | 42 +-
.../application/manager/business/Subjects.java | 15 +-
.../application/manager/business/Templates.java | 7 +-
.../manager/business/webservice/Constants.java | 4 +-
.../business/webservice/FastAccessFile.java | 5 +-
.../manager/business/webservice/LogViewer.java | 4 +-
.../business/webservice/PlatformEventExport.java | 105 ++-
.../manager/business/webservice/SystemReport.java | 21 +-
.../manager/business/webservice/ThreadViewer.java | 10 +-
.../manager/form/DatabaseConnectionForm.java | 15 +
.../appng/application/manager/form/GrantForm.java | 4 +-
.../appng/application/manager/form/GroupForm.java | 4 +-
.../manager/form/PackageUploadForm.java | 2 +-
.../application/manager/form/PropertyForm.java | 10 +-
.../application/manager/form/RepositoryForm.java | 2 +-
.../application/manager/form/ResourceForm.java | 12 +-
.../appng/application/manager/form/RoleForm.java | 8 +-
.../appng/application/manager/form/SiteForm.java | 2 +-
.../application/manager/form/SubjectForm.java | 31 +-
.../appng/application/manager/form/UploadForm.java | 2 +-
.../application/manager/job/DatabaseReportJob.java | 5 +-
.../application/manager/job/LogDatabaseSize.java | 8 +-
.../manager/job/PlatformEventReportJob.java | 5 +-
.../application/manager/job/ReportJobBase.java | 10 +-
.../manager/service/ManagerService.java | 314 +++----
.../manager/service/PlatformEventService.java | 4 +-
.../application/manager/service/RoleService.java | 9 +-
.../appng/application/manager/service/Service.java | 19 +-
.../application/manager/service/ServiceAware.java | 2 +-
.../manager/soap/endpoint/RepositoryService.java | 2 +-
.../application/manager/business/AbstractTest.java | 41 +-
.../business/ApplicationPropertiesTest.java | 4 +-
.../manager/business/ClusterStateTest.java | 2 +-
.../manager/business/DataBaseConnectionsTest.java | 2 +-
.../application/manager/business/GroupsTest.java | 2 +-
.../manager/business/LdapUsersTest.java | 59 ++
.../manager/business/PermissionsTest.java | 2 +-
.../manager/business/PlatformEventsTest.java | 2 +-
.../manager/business/PlatformPropertiesTest.java | 56 +-
.../manager/business/RepositoriesTest.java | 2 +-
.../application/manager/business/RoleTest.java | 2 +-
.../application/manager/business/SessionsTest.java | 34 +-
.../manager/business/SessionsTestBean.java | 54 ++
.../manager/business/SitePropertiesTest.java | 21 +-
.../application/manager/business/SitesTest.java | 5 +-
.../manager/business/SqlExecutorTest.java | 6 +-
.../application/manager/business/SubjectsTest.java | 25 +-
.../manager/business/webservice/LogViewerTest.java | 6 +-
src/test/resources/beans-test.xml | 2 +
src/test/resources/log4j.properties | 5 +-
.../xml/ApplicationPropertiesTest-testShowAll.xml | 8 +-
.../xml/ApplicationPropertiesTest-testShowOne.xml | 26 +-
.../ApplicationPropertiesTest-testUpdate-data.xml | 26 +-
.../xml/DataBaseConnectionsTest-testMigrations.xml | 124 ++-
.../xml/DataBaseConnectionsTest-testOverview.xml | 2 +-
.../resources/xml/LdapUsersTest-testSettings.xml | 74 ++
src/test/resources/xml/LdapUsersTest-testUsers.xml | 24 +
.../PlatformPropertiesTest-testCreateBoolean.xml | 37 +
.../PlatformPropertiesTest-testCreateMultiline.xml | 39 +
.../xml/PlatformPropertiesTest-testShowAll.xml | 70 +-
.../xml/PlatformPropertiesTest-testShowOne.xml | 26 +-
.../xml/PlatformPropertiesTest-testUpdate-data.xml | 26 +-
.../xml/SitePropertiesTest-testShowAll.xml | 23 +-
.../xml/SitePropertiesTest-testShowOne.xml | 26 +-
.../xml/SitePropertiesTest-testUpdate-data.xml | 26 +-
.../resources/xml/SqlExecutorTest-testExecute.xml | 16 +-
.../xml/SubjectsTest-testCreate-action.xml | 970 ++++++++++----------
.../xml/SubjectsTest-testCreateNameExists.xml | 970 ++++++++++----------
.../xml/SubjectsTest-testCreateValidationFail.xml | 982 ++++++++++----------
.../resources/xml/SubjectsTest-testShowAll.xml | 25 +-
.../xml/SubjectsTest-testShowAllFilterGroup.xml | 25 +-
.../resources/xml/SubjectsTest-testShowOne.xml | 985 +++++++++++----------
.../xml/SubjectsTest-testUpdate-action.xml | 985 +++++++++++----------
113 files changed, 4193 insertions(+), 3360 deletions(-)
create mode 100644 application-home/conf/datasources/ds-ldapusers.xml
create mode 100644 src/main/java/org/appng/application/manager/business/LdapUsers.java
rename src/main/java/org/appng/application/manager/business/{Upload.java => ResourceUpload.java} (61%)
create mode 100644 src/test/java/org/appng/application/manager/business/LdapUsersTest.java
create mode 100644 src/test/java/org/appng/application/manager/business/SessionsTestBean.java
create mode 100644 src/test/resources/xml/LdapUsersTest-testSettings.xml
create mode 100644 src/test/resources/xml/LdapUsersTest-testUsers.xml
create mode 100644 src/test/resources/xml/PlatformPropertiesTest-testCreateBoolean.xml
create mode 100644 src/test/resources/xml/PlatformPropertiesTest-testCreateMultiline.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
