Console Output
+ git merge --ff appng-manager-1.15.x --strategy-option theirs
Removing src/main/java/org/appng/application/manager/builder/SelectionBuilder.java
Removing src/main/java/org/appng/application/manager/builder/OptionsBuilder.java
Merge made by the 'recursive' strategy.
README.adoc | 12 +-
.../conf/datasources/ds-applications.xml | 45 +-
.../conf/datasources/ds-connections.xml | 11 +-
application-home/conf/datasources/ds-groups.xml | 24 +-
application-home/conf/datasources/ds-jars.xml | 4 +-
.../conf/datasources/ds-permissions.xml | 12 +-
.../conf/datasources/ds-repositories.xml | 23 +-
application-home/conf/datasources/ds-resources.xml | 16 +-
application-home/conf/datasources/ds-roles.xml | 12 +-
application-home/conf/datasources/ds-sites.xml | 18 +-
application-home/conf/datasources/ds-subjects.xml | 20 +-
application-home/conf/datasources/ds-templates.xml | 6 +-
application-home/conf/events/ev-subjects.xml | 10 +-
application-home/conf/pages/pg-repositories.xml | 2 +
application-home/conf/pages/pg-sites.xml | 6 +
application-home/conf/pages/pg-subjects.xml | 10 +-
application-home/conf/pages/pg-system.xml | 3 +
changelog.txt | 26 +
pom.xml | 4 +-
.../manager/builder/OptionsBuilder.java | 114 --
.../manager/builder/SelectionBuilder.java | 101 --
.../appng/application/manager/business/Groups.java | 5 +-
.../application/manager/business/Installation.java | 18 +-
.../application/manager/business/LogConfig.java | 2 +-
.../manager/business/PlatformEvents.java | 4 +-
.../application/manager/business/Sessions.java | 48 +-
.../appng/application/manager/business/Sites.java | 4 +-
.../application/manager/business/Subjects.java | 3 +-
.../manager/business/webservice/LogViewer.java | 25 +-
.../manager/service/ManagerService.java | 119 +-
.../appng/application/manager/service/Service.java | 10 +-
.../manager/soap/endpoint/RepositoryService.java | 17 +-
.../application/manager/business/GroupsTest.java | 26 +-
.../manager/business/RepositoriesTest.java | 8 +-
.../application/manager/business/SitesTest.java | 18 +
.../application/manager/business/SubjectsTest.java | 15 +-
.../manager/job/DatabaseReportJobTest.java | 2 -
.../xml/ApplicationPropertiesTest-testCreate.xml | 2 +-
.../xml/ApplicationPropertiesTest-testShowAll.xml | 236 ++--
.../xml/ApplicationPropertiesTest-testShowOne.xml | 96 +-
.../ApplicationPropertiesTest-testUpdate-data.xml | 96 +-
.../xml/ApplicationPropertiesTest-testUpdate.xml | 2 +-
.../xml/ClusterStateTest-testClusterState.xml | 103 +-
.../xml/DataBaseConnectionsTest-testMigrations.xml | 550 ++++----
.../xml/DataBaseConnectionsTest-testOverview.xml | 175 ++-
.../xml/GroupsTest-testCreateGroup-action.xml | 131 +-
.../xml/GroupsTest-testCreateGroup-messages.xml | 2 +-
.../xml/GroupsTest-testCreateGroupNameExists.xml | 133 +-
.../resources/xml/GroupsTest-testDeleteGroup.xml | 2 +-
.../resources/xml/GroupsTest-testShowGroup.xml | 76 +-
.../resources/xml/GroupsTest-testShowGroups.xml | 229 ++--
.../xml/GroupsTest-testShowGroupsFilterName.xml | 83 ++
.../xml/GroupsTest-testUpdateAdminGroup-action.xml | 143 +--
.../GroupsTest-testUpdateAdminGroup-messages.xml | 2 +-
.../xml/GroupsTest-testUpdateGroup-action.xml | 143 +--
.../xml/GroupsTest-testUpdateGroup-messages.xml | 2 +-
.../xml/PermissionsTest-testCreate-action.xml | 104 +-
.../xml/PermissionsTest-testCreate-messages.xml | 2 +-
.../xml/PermissionsTest-testCreateNameExists.xml | 106 +-
.../xml/PermissionsTest-testDeletePermission.xml | 2 +-
.../xml/PermissionsTest-testShowPermission.xml | 54 +-
.../xml/PermissionsTest-testShowPermissions.xml | 215 ++--
.../xml/PermissionsTest-testUpdate-action.xml | 122 +-
.../xml/PermissionsTest-testUpdate-messages.xml | 2 +-
.../xml/PlatformEventsTest-testShowAll.xml | 177 +--
.../xml/PlatformPropertiesTest-testCreate.xml | 2 +-
.../xml/PlatformPropertiesTest-testShowAll.xml | 248 ++--
.../xml/PlatformPropertiesTest-testShowOne.xml | 96 +-
.../xml/PlatformPropertiesTest-testUpdate-data.xml | 96 +-
.../xml/PlatformPropertiesTest-testUpdate.xml | 2 +-
...epositoriesTest-testCreateRepository-action.xml | 154 +--
...ositoriesTest-testCreateRepository-messages.xml | 2 +-
...sitoriesTest-testCreateRepositoryNameExists.xml | 164 +--
.../xml/RepositoriesTest-testDeleteRepository.xml | 2 +-
.../xml/RepositoriesTest-testShowRepositories.xml | 335 ++---
.../xml/RepositoriesTest-testShowRepository.xml | 162 ++-
...epositoriesTest-testUpdateRepository-action.xml | 214 ++--
...ositoriesTest-testUpdateRepository-messages.xml | 2 +-
.../resources/xml/RoleTest-testCreate-action.xml | 143 +--
.../resources/xml/RoleTest-testCreate-messages.xml | 2 +-
.../xml/RoleTest-testCreateNameExists.xml | 145 +--
src/test/resources/xml/RoleTest-testDelete.xml | 2 +-
src/test/resources/xml/RoleTest-testShowAll.xml | 164 ++-
src/test/resources/xml/RoleTest-testShowOne.xml | 82 +-
.../resources/xml/RoleTest-testUpdate-action.xml | 153 ++-
.../resources/xml/RoleTest-testUpdate-messages.xml | 2 +-
.../xml/SessionsTest-testShowSessions.xml | 345 ++---
.../xml/SessionsTest-testShowSessionsFiltered.xml | 277 +++--
.../xml/SitePropertiesTest-testCreate.xml | 2 +-
.../xml/SitePropertiesTest-testShowAll.xml | 236 ++--
.../xml/SitePropertiesTest-testShowOne.xml | 96 +-
.../xml/SitePropertiesTest-testUpdate-data.xml | 96 +-
.../xml/SitePropertiesTest-testUpdate.xml | 2 +-
.../xml/SitesTest-testCreateSite-action.xml | 207 +--
.../xml/SitesTest-testCreateSite-messages.xml | 2 +-
.../xml/SitesTest-testCreateSiteValidationFail.xml | 219 ++--
.../resources/xml/SitesTest-testDeleteSite.xml | 2 +-
.../resources/xml/SitesTest-testReloadSite.xml | 2 +-
src/test/resources/xml/SitesTest-testShowSite.xml | 108 +-
src/test/resources/xml/SitesTest-testShowSites.xml | 30 +-
.../xml/SitesTest-testShowSitesFiltered.xml | 135 ++
.../resources/xml/SqlExecutorTest-testExecute.xml | 86 +-
.../xml/SubjectsTest-testCreate-action.xml | 1283 +++++++++----------
.../xml/SubjectsTest-testCreate-messages.xml | 2 +-
.../xml/SubjectsTest-testCreateNameExists.xml | 1291 +++++++++----------
.../xml/SubjectsTest-testCreateValidationFail.xml | 1314 ++++++++++----------
src/test/resources/xml/SubjectsTest-testDelete.xml | 2 +-
.../resources/xml/SubjectsTest-testShowAll.xml | 27 +-
.../xml/SubjectsTest-testShowAllFilterGroup.xml | 113 ++
.../resources/xml/SubjectsTest-testShowOne.xml | 1195 +++++++++---------
.../xml/SubjectsTest-testUpdate-action.xml | 1282 +++++++++----------
.../xml/SubjectsTest-testUpdate-messages.xml | 2 +-
112 files changed, 7358 insertions(+), 6963 deletions(-)
delete mode 100644 src/main/java/org/appng/application/manager/builder/OptionsBuilder.java
delete mode 100644 src/main/java/org/appng/application/manager/builder/SelectionBuilder.java
create mode 100644 src/test/resources/xml/GroupsTest-testShowGroupsFilterName.xml
create mode 100644 src/test/resources/xml/SitesTest-testShowSitesFiltered.xml
create mode 100644 src/test/resources/xml/SubjectsTest-testShowAllFilterGroup.xml
![[Jenkins]](/jenkins/static/0ac95dd5/images/svgs/logo.svg){kind=logo}
