xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer." into asm_14.4.1

Browse source 
Former-commit-id: fbf33bdd40 [formerly b67ff1b062] [formerly 6b93d792f0] [formerly fbf33bdd40 [formerly b67ff1b062] [formerly 6b93d792f0] [formerly 88fbcaa849 [formerly 6b93d792f0 [formerly 45ad574592e05ba3f9a0f27b2afd2c9a0e5d19a2]]]]
Former-commit-id: 88fbcaa849
Former-commit-id: 3e3cafbee5 [formerly 1287992214] [formerly 5bd59b5b97585a8c2dff833333d671c9a35f3761 [formerly de30b92ea4]]
Former-commit-id: 98cbdea96dd124acc9f128f2117803759a2c017f [formerly 3fb051ef8f]
Former-commit-id: d11c5a279a
This commit is contained in:
Juliya Dynina 2014-12-15 12:25:14 -05:00 • committed by Gerrit Code Review
commit b75f49babc
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
View file

@ -18,6 +18,7 @@ Import-Package: com.raytheon.edex.util,
com.raytheon.uf.edex.database.dao,
com.raytheon.uf.edex.database.plugin,
com.raytheon.uf.edex.plugin.text.db,
com.raytheon.uf.edex.plugin.text.dbsrv.impl,
org.quartz
Export-Package: com.raytheon.uf.edex.ohd,
com.raytheon.uf.edex.ohd.reportalarm,

9
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
View file

@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import com.raytheon.uf.common.ohd.AppsDefaults;
import com.raytheon.uf.common.status.IUFStatusHandler;
@ -30,6 +31,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.util.TimeUtil;
import com.raytheon.uf.common.util.FileUtil;
import com.raytheon.uf.edex.plugin.text.db.TextDB;
import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
/**
* Provides SHEF with the ability to generate alert/alarms report products and
@ -44,6 +46,7 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 12, 2014 #2783 dgilling Initial creation
* Dec 15, 2014 16736 mgamazaychikov Add call to sendProductAlarmAlert.
*
* </pre>
*
@ -149,6 +152,12 @@ public final class RunReportAlarmSrv {
TextDB textdb = new TextDB();
long statusCode = textdb.writeProduct(productId, productText, true,
null);
// Set the current time and send product alarm alert.
Date d = new Date(System.currentTimeMillis());
d.setTime(statusCode);
AlarmAlertUtil.sendProductAlarmAlert(productId,
String.valueOf(d.getTime()),
true);
if (statusCode != Long.MIN_VALUE) {
statusHandler.info("Product successfully sent");

3
edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
View file

@ -17,7 +17,8 @@ Require-Bundle: org.apache.commons.lang,
Export-Package: com.raytheon.uf.edex.plugin.text,
com.raytheon.uf.edex.plugin.text.dao,
com.raytheon.uf.edex.plugin.text.db,
com.raytheon.uf.edex.plugin.text.dbsrv
com.raytheon.uf.edex.plugin.text.dbsrv,
com.raytheon.uf.edex.plugin.text.dbsrv.impl
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: com.raytheon.edex.uengine.runners,
com.raytheon.uf.common.dataplugin.text,