Console Output

+ git merge --ff appng-manager-1.18.x --strategy-option theirs
Auto-merging src/test/java/org/appng/application/manager/business/CacheTest.java
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 application-home/application.xml                   |   5 +-
 application-home/conf/config.xml                   |   4 +
 application-home/conf/datasources/ds-cache.xml     |  10 +
 application-home/conf/datasources/ds-mail.xml      |  44 +++
 application-home/conf/datasources/ds-sites.xml     |   3 +-
 application-home/conf/datasources/ds-subjects.xml  |  12 +-
 application-home/conf/events/ev-mail.xml           |  22 ++
 application-home/conf/pages/pg-sites.xml           |   3 +
 application-home/conf/pages/pg-system.xml          |   5 +
 .../dictionary/manager-messages.properties         |  13 +
 .../dictionary/manager-messages_de.properties      |  13 +
 pom.xml                                            |   2 +-
 .../appng/application/manager/business/Cache.java  | 159 +++++----
 .../application/manager/business/Environment.java  | 124 +++----
 .../appng/application/manager/business/Mailer.java |  85 +++++
 .../appng/application/manager/business/Sites.java  |   7 +-
 .../appng/application/manager/form/MailForm.java   |  65 ++++
 .../manager/service/ManagerService.java            |  18 +-
 .../appng/application/manager/service/Service.java |  22 +-
 .../application/manager/business/AbstractTest.java |   7 +
 .../application/manager/business/CacheTest.java    |  92 +++---
 .../manager/business/EnvironmentTest.java          |  62 ++++
 .../application/manager/business/MailTest.java     |  57 ++++
 .../application/manager/business/SitesTest.java    |   2 +-
 src/test/resources/hazelcast-test.xml              |  23 ++
 src/test/resources/xml/CacheTest-testCache.xml     | 364 +++++++++++++++++++++
 .../xml/CacheTest-testCacheStatistics.xml          | 130 ++++++++
 .../xml/EnvironmentTest-validateJvmArguments.xml   |  35 ++
 .../xml/EnvironmentTest-validateMemory.xml         |  33 ++
 .../xml/EnvironmentTest-validateProcessor.xml      |  18 +
 .../xml/EnvironmentTest-validateSystemEnv.xml      |  18 +
 .../xml/EnvironmentTest-validateSystemProps.xml    |  18 +
 src/test/resources/xml/MailTest-testSendMail.xml   | 103 ++++++
 src/test/resources/xml/SitesTest-testShowSites.xml |   7 +
 .../xml/SitesTest-testShowSitesFiltered.xml        |   7 +
 .../resources/xml/SubjectsTest-testShowAll.xml     |  21 +-
 .../xml/SubjectsTest-testShowAllFilterGroup.xml    |  21 +-
 37 files changed, 1428 insertions(+), 206 deletions(-)
 create mode 100644 application-home/conf/datasources/ds-mail.xml
 create mode 100644 application-home/conf/events/ev-mail.xml
 create mode 100644 src/main/java/org/appng/application/manager/business/Mailer.java
 create mode 100644 src/main/java/org/appng/application/manager/form/MailForm.java
 create mode 100644 src/test/java/org/appng/application/manager/business/EnvironmentTest.java
 create mode 100644 src/test/java/org/appng/application/manager/business/MailTest.java
 create mode 100644 src/test/resources/hazelcast-test.xml
 create mode 100644 src/test/resources/xml/CacheTest-testCache.xml
 create mode 100644 src/test/resources/xml/CacheTest-testCacheStatistics.xml
 create mode 100644 src/test/resources/xml/EnvironmentTest-validateJvmArguments.xml
 create mode 100644 src/test/resources/xml/EnvironmentTest-validateMemory.xml
 create mode 100644 src/test/resources/xml/EnvironmentTest-validateProcessor.xml
 create mode 100644 src/test/resources/xml/EnvironmentTest-validateSystemEnv.xml
 create mode 100644 src/test/resources/xml/EnvironmentTest-validateSystemProps.xml
 create mode 100644 src/test/resources/xml/MailTest-testSendMail.xml