From 9aab10d65ad72c8a3fbaf0b77539a37e7146dccd Mon Sep 17 00:00:00 2001
From: Alejandro Revilla <apr@jpos.org>
Date: Wed, 31 May 2017 12:06:43 -0300
Subject: [PATCH] SAFMonitor split into its own module

People using just SAF without SAFMonitor doesn't need to carry all
SAFMonitor's dependencies.
---
 modules/saf-monitor/build.gradle                |  7 +++++++
 .../src/main/java/org/jpos/saf/SAFMonitor.java  |  0
 .../q2/installs/deploy/20_saf.xml.sample        | 17 +++++++++++++++++
 .../installs/deploy/95_saf_monitor.xml.sample   |  9 +++++++++
 modules/saf/build.gradle                        |  2 +-
 settings.gradle                                 |  1 +
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 modules/saf-monitor/build.gradle
 rename modules/{saf => saf-monitor}/src/main/java/org/jpos/saf/SAFMonitor.java (100%)
 create mode 100644 modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/20_saf.xml.sample
 create mode 100644 modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/95_saf_monitor.xml.sample

diff --git a/modules/saf-monitor/build.gradle b/modules/saf-monitor/build.gradle
new file mode 100644
index 0000000000..c8e9cf5e75
--- /dev/null
+++ b/modules/saf-monitor/build.gradle
@@ -0,0 +1,7 @@
+description = 'jPOS-EE :: Store and Forward (SAF) Monitor Module'
+
+dependencies {
+    compile project(':modules:saf')
+    compile project(':modules:status')
+}
+
diff --git a/modules/saf/src/main/java/org/jpos/saf/SAFMonitor.java b/modules/saf-monitor/src/main/java/org/jpos/saf/SAFMonitor.java
similarity index 100%
rename from modules/saf/src/main/java/org/jpos/saf/SAFMonitor.java
rename to modules/saf-monitor/src/main/java/org/jpos/saf/SAFMonitor.java
diff --git a/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/20_saf.xml.sample b/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/20_saf.xml.sample
new file mode 100644
index 0000000000..98966c2d39
--- /dev/null
+++ b/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/20_saf.xml.sample
@@ -0,0 +1,17 @@
+<saf name='saf' logger='Q2' realm='saf' class='org.jpos.saf.SAF'>
+ <property name='space' value='jdbm:saf' />
+ <property name='mux' value='mux' />
+ <property name='flag-retransmissions' value='no'> 
+  if MTI is in list, messages would be retransmitted as xxx1
+ </property>
+ <property name='initial-delay' value='60000' />
+ <property name='inter-message-delay' value='1000' />
+ <property name='wait-for-response' value='60000' />
+ <property name='max-retransmissions' value='1000' />
+ <property name='expire-after' value='86400'>
+  in seconds
+ </property>
+ <property name='valid-response-codes' value='*' />
+ <property name='retry-response-codes' value='91,ZZ' />
+</saf>
+
diff --git a/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/95_saf_monitor.xml.sample b/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/95_saf_monitor.xml.sample
new file mode 100644
index 0000000000..a179b7d36d
--- /dev/null
+++ b/modules/saf-monitor/src/main/resources/META-INF/q2/installs/deploy/95_saf_monitor.xml.sample
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<saf-monitor class='org.jpos.ee.status.Monitor' logger='Q2'>
+ <monitor id="SAF" delay='10000' period='30000'>
+  <class>org.jpos.saf.SAFMonitor</class>
+  <property name='saf' value='saf' />
+ </monitor>
+</saf-monitor>
+
diff --git a/modules/saf/build.gradle b/modules/saf/build.gradle
index be7e03abae..af308d27fe 100644
--- a/modules/saf/build.gradle
+++ b/modules/saf/build.gradle
@@ -2,5 +2,5 @@ description = 'jPOS-EE :: Store and Forward (SAF) Module'
 
 dependencies {
     compile project(':modules:core')
-    compile project(':modules:status')
 }
+
diff --git a/settings.gradle b/settings.gradle
index 76171778e3..fe7b275fc4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,7 @@ include ':modules:core',
         ':modules:mail',
         ':modules:jetty',
         ':modules:saf',
+        ':modules:saf-monitor',
         ':modules:things',
         ':modules:server-simulator',
         ':modules:client-simulator',