Console Output

+ git merge --ff appng-manager-1.19.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 application-home/conf/events/ev-repositories.xml   | 10 ++---
 application-home/conf/pages/pg-repositories.xml    |  4 +-
 license-header.txt                                 |  2 +-
 pom.xml                                            | 20 +++++++++-
 .../application/manager/business/Applications.java |  2 +-
 .../appng/application/manager/business/Beans.java  |  2 +-
 .../appng/application/manager/business/Cache.java  |  2 +-
 .../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 |  2 +-
 .../appng/application/manager/business/Jars.java   |  2 +-
 .../application/manager/business/LdapUsers.java    |  2 +-
 .../application/manager/business/LogConfig.java    |  2 +-
 .../manager/business/LogConfigChangedEvent.java    |  2 +-
 .../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     |  2 +-
 .../appng/application/manager/business/Sites.java  |  2 +-
 .../application/manager/business/SqlExecutor.java  | 45 +++++++++++++++-------
 .../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 +-
 .../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   |  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            |  2 +-
 .../manager/service/PlatformEventService.java      |  2 +-
 .../application/manager/service/RoleService.java   |  2 +-
 .../appng/application/manager/service/Service.java |  2 +-
 .../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       | 15 ++++++++
 .../manager/business/PermissionsTest.java          |  2 +-
 .../manager/business/PlatformEventsTest.java       |  2 +-
 .../manager/business/PlatformPropertiesTest.java   |  2 +-
 .../manager/business/RepositoriesTest.java         |  2 +-
 .../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    |  2 +-
 .../manager/business/SqlExecutorTest.java          | 23 ++++++++++-
 .../application/manager/business/SubjectsTest.java |  2 +-
 .../manager/business/webservice/LogViewerTest.java |  2 +-
 .../manager/job/DatabaseReportJobTest.java         | 15 ++++++++
 ...epositoriesTest-testUpdateRepository-action.xml |  6 +--
 83 files changed, 188 insertions(+), 100 deletions(-)