Merge branch 'master_16.2.1' into master_16.2.1-lx
Former-commit-id: c220eaaf3fd9b6f2a76759c4c8fa8a4956e6b623
This commit is contained in:
Shawn.Hooper
commit
6e41b71969
4 changed files with 54 additions and 28 deletions
|
|
@ -9,6 +9,8 @@
|
|||
## BOOKBINDER 6-15-2015 Corrected bad softball/grapefruit hail sized. ##
|
||||
## Removed redundant tornado watch phrase from CTA ##
|
||||
## Bookbinder 10-20-2015 Fixed extraSource var for tornado info ##
|
||||
## Bookbinder 4-14-2016 Accounted for case where someone inadvertantly ##
|
||||
## de-selected required source ##
|
||||
#####################################################################################
|
||||
## Impact Statements for IBW templates are contained in impactStatements.vm
|
||||
################################################################
|
||||
|
|
@ -16,7 +18,8 @@
|
|||
#parse("config.vm")
|
||||
##SET SOME INITIAL VARIABLES
|
||||
#set($hazard = "")
|
||||
#set($source = "")
|
||||
#set($source = "!** YOU FAILED TO SELECT A SOURCE. PLEASE TYPE ONE OR REGENERATE THIS WARNING **!")
|
||||
#set($reportAuthSVR = "producing")
|
||||
#set($torTag = "")
|
||||
#set($pdssvr = "")
|
||||
#set($extraSource = "")
|
||||
|
|
@ -444,11 +447,11 @@ Those attending !**EVENT/VENUE NAME OR LOCATION*! are in the path of this storm
|
|||
## Comment out #parse command below to pull in Dynamic DSS Event Info
|
||||
## If this feature is utilized, the "specialEvent" bullet (output above) can
|
||||
## likely be commented out from the impactSevereThunderstormWarning.xml file
|
||||
##parse("dssEvents.vm")
|
||||
## #parse("dssEvents.vm")
|
||||
## parse file command here is to pull in mile marker info
|
||||
#parse("mileMarkers.vm")
|
||||
## #parse("mileMarkers.vm")
|
||||
## parse file command here is to pull in extra points (venues) info
|
||||
##parse("pointMarkers.vm")
|
||||
## #parse("pointMarkers.vm")
|
||||
|
||||
##################################
|
||||
######### CALLS TO ACTION ########
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@
|
|||
## Phil Kurimski 10-20-2015 Added waterspout option to TOR basis ##
|
||||
## Evan Bookbinder 10-20-2015 fixed extraSource variable usage ##
|
||||
## Phil Kurimski 10-21-2015 Fixed Tornado Preamble for mixed case ##
|
||||
## Evan Bookbinder 4-04-2016 "therefore", "and" case/grammar fix in CAN/EXP ##
|
||||
## Evan Bookbinder 4-14-2016 Added exception case if forecaster ##
|
||||
## inadvertantly doesn't have a source selected ##
|
||||
#############################################################################
|
||||
## Impact Statements for IBW templates are contained in impactStatements.vm
|
||||
################################################################
|
||||
|
|
@ -48,6 +51,7 @@
|
|||
##PATHCAST LEAD VARIABLE ADD LATER?????
|
||||
#if(${phenomena}=="SV")
|
||||
#set($eventType = "SEVERE THUNDERSTORM")
|
||||
#set($source = "!** YOU FAILED TO SELECT A SOURCE. PLEASE TYPE ONE OR REGENERATE THIS WARNING **!")
|
||||
#if(${stormType} == "line")
|
||||
#set($reportType1 = "severe thunderstorms were")
|
||||
#set($reportType2 = "these storms were")
|
||||
|
|
@ -189,44 +193,44 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}
|
|||
#if(${action}=="EXP" || ${action}=="CAN" || ${action}=="CANCON" || ${CORCAN}=="true")
|
||||
#### SET A DEFAULT STATEMENT IN CASE NO BULLET WAS SELECTED OR AVAILABLE
|
||||
#if(${stormType} == "line")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have !** weakened. moved out of the warned area.**! therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have !** weakened. moved out of the warned area.**! Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#if(${phenomena}=="SV")
|
||||
#set($expcanPhrase = "The severe thunderstorm which prompted the warning has !** weakened. moved out of the warned area. **! therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The severe thunderstorm which prompted the warning has !** weakened. moved out of the warned area. **! Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#set($expcanPhrase = "The tornadic thunderstorm which prompted the warning has !** weakened. moved out of the warned area. **! therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The tornadic thunderstorm which prompted the warning has !** weakened. moved out of the warned area. **! Therefore, the warning ${expcanBODYTag}.")
|
||||
#end
|
||||
#end
|
||||
#### WEAKENED BELOW SEVERE LIMITS
|
||||
#if(${list.contains(${bullets}, "weakened")})
|
||||
#if(${stormType} == "line")
|
||||
#if(${phenomena}=="SV")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and no longer pose an immediate threat to life or property. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and no longer pose an immediate threat to life or property. Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and no longer appear capable of producing a tornado. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and no longer appear capable of producing a tornado. Therefore, the warning ${expcanBODYTag}.")
|
||||
#end
|
||||
#else
|
||||
#if(${phenomena}=="SV")
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and no longer pose an immediate threat to life or property. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and no longer pose an immediate threat to life or property. Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and no longer appears capable of producing a tornado. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and no longer appears capable of producing a tornado. Therefore, the warning ${expcanBODYTag}.")
|
||||
#end
|
||||
#end
|
||||
#end
|
||||
#### MOVED OUT OF THE WARNED AREA
|
||||
#if(${list.contains(${bullets}, "movedout")})
|
||||
#if(${stormType} == "line")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have moved out of the area. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have moved out of the area. Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#set($expcanPhrase = "The storm which prompted the warning has moved out of the area. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storm which prompted the warning has moved out of the area. Therefore, the warning ${expcanBODYTag}.")
|
||||
#end
|
||||
#end
|
||||
#### WEAKENED AND MOVED OUT OF THE AREA
|
||||
#if(${list.contains(${bullets}, "wkndandmoved")})
|
||||
#if(${stormType} == "line")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and have exited the warned area. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storms which prompted the warning have weakened below severe limits, and have exited the warned area. Therefore, the warning ${expcanBODYTag}.")
|
||||
#else
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and have exited the warned area. Therefore the warning ${expcanBODYTag}.")
|
||||
#set($expcanPhrase = "The storm which prompted the warning has weakened below severe limits, and have exited the warned area. Therefore, the warning ${expcanBODYTag}.")
|
||||
#end
|
||||
#end
|
||||
#### SVR UPGRADED TO TOR
|
||||
|
|
@ -287,9 +291,9 @@ ${dateUtil.format(${now}, ${timeFormat.header}, ${localtimezone})}
|
|||
#elseif(${addhailcheck} == "1" && ${addwindcheck} == "1" && ${addraincheck} == "0" )
|
||||
#set($addthreat = " However ${addhail} and ${addwind} are still possible with ${stormTypePhrase}.")
|
||||
#elseif(${addhailcheck} == "1" && ${addwindcheck} == "0" && ${addraincheck} == "1" )
|
||||
#set($addthreat = " However ${addhail} AND ${addrain} are still possible with ${stormTypePhrase}.")
|
||||
#set($addthreat = " However ${addhail} and ${addrain} are still possible with ${stormTypePhrase}.")
|
||||
#elseif(${addhailcheck} == "0" && ${addwindcheck} == "1" && ${addraincheck} == "1" )
|
||||
#set($addthreat = " However ${addwind} AND ${addrain} are still possible with ${stormTypePhrase}.")
|
||||
#set($addthreat = " However ${addwind} and ${addrain} are still possible with ${stormTypePhrase}.")
|
||||
#elseif(${addhailcheck} == "1" && ${addwindcheck} == "1" && ${addraincheck} == "1" )
|
||||
#set($addthreat = " However ${addhail}, ${addwind} and ${addrain} are still possible with ${stormTypePhrase}.")
|
||||
#end
|
||||
|
|
@ -979,7 +983,7 @@ Those attending the !**EVENT/VENUE NAME OR LOCATION**! are in the path of this s
|
|||
#end
|
||||
#end
|
||||
|
||||
## parse file command here is to pull in mile marker info
|
||||
## parse file command here is to pull in DSS info
|
||||
## #parse("dssEvents.vm")
|
||||
## parse file command here is to pull in extra locations (venues) info
|
||||
## #parse("pointMarkers.vm")
|
||||
|
|
@ -1108,7 +1112,7 @@ This storm is producing large hail. Seek shelter now inside a sturdy structure a
|
|||
This is a dangerous situation. These storms are producing widespread wind damage across !** ENTER LOCATION **!. Seek shelter now inside a sturdy structure and stay away from windows.
|
||||
|
||||
#else
|
||||
This is a dangerous situation. This storm is producing widespread wind damage across !** ENTER LOCATION **!. sSek shelter now inside a sturdy structure and stay away from windows.
|
||||
This is a dangerous situation. This storm is producing widespread wind damage across !** ENTER LOCATION **!. Seek shelter now inside a sturdy structure and stay away from windows.
|
||||
|
||||
#end
|
||||
#end
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@ package com.raytheon.uf.common.registry.event;
|
|||
import oasis.names.tc.ebxml.regrep.xsd.rim.v4.RegistryObjectType;
|
||||
|
||||
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
|
||||
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
|
||||
|
||||
/**
|
||||
*
|
||||
* TODO Add Description
|
||||
* Registry Event for removing objects
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
|
|
@ -37,7 +38,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
|
|||
* Mar 16, 2012 jsanchez Initial creation
|
||||
* Nov 08, 2013 2506 bgonzale Added constructors. Added object deleted field.
|
||||
* Added RegistryObjectType field.
|
||||
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
|
||||
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
|
||||
* Apr 05, 2016 5488 tjensen Added DynamicSerializeElement to removedObject
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
|
|
@ -49,6 +51,7 @@ public class RemoveRegistryEvent extends RegistryEvent {
|
|||
|
||||
private static final long serialVersionUID = -5854149256576746509L;
|
||||
|
||||
@DynamicSerializeElement
|
||||
private RegistryObjectType removedObject;
|
||||
|
||||
public RemoveRegistryEvent() {
|
||||
|
|
|
|||
|
|
@ -95,8 +95,8 @@ import com.raytheon.uf.edex.registry.events.DeleteSlotEvent;
|
|||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* Jan 18, 2012 bphillip Initial creation
|
||||
* Sep 14, 2012 1169 djohnson Throw exception when object exists during create only mode.
|
||||
* Jan 18, 2012 bphillip Initial creation
|
||||
* Sep 14, 2012 1169 djohnson Throw exception when object exists during create only mode.
|
||||
* 3/18/2013 1802 bphillip Modified to use transaction boundaries and spring injection
|
||||
* 4/9/2013 1802 bphillip Changed how auditable events are handled
|
||||
* Apr 18, 2013 1693 djohnson Changes to conform to Ebxml 4.0 SubmitObjects protocol.
|
||||
|
|
@ -109,12 +109,13 @@ import com.raytheon.uf.edex.registry.events.DeleteSlotEvent;
|
|||
* Separate update from create notifications.
|
||||
* 12/2/2013 1829 bphillip Auditable events are not genereted via messages on the event bus
|
||||
* 01/21/2014 2613 bphillip Removed verbose log message from removeObjects
|
||||
* 2/19/2014 2769 bphillip Added current time to audit trail events
|
||||
* 2/19/2014 2769 bphillip Added current time to audit trail events
|
||||
* Mar 31, 2014 2889 dhladky Added username for notification center tracking.
|
||||
* 4/11/2014 3011 bphillip Modified merge behavior
|
||||
* 4/17/2014 3011 bphillip Delete slot events now contain strings
|
||||
* June 25, 2014 2760 dhladky Added external delivery of registry events
|
||||
* Jun 25, 2014 2760 dhladky Added external delivery of registry events
|
||||
* May 14, 2015 4493 dhladky Better integrated external delivery of registry events.
|
||||
* Apr 05, 2016 5488 tjensen Fixed serialization issue in removeObjects
|
||||
*
|
||||
*
|
||||
* </pre>
|
||||
|
|
@ -297,8 +298,22 @@ public class LifecycleManagerImpl implements LifecycleManager {
|
|||
// Don't send notifications for Association types
|
||||
if (objectType != null
|
||||
&& !objectType.equals(RegistryObjectTypes.ASSOCIATION)) {
|
||||
|
||||
/*
|
||||
* Clone the object before publishing it to the Event Bus. This
|
||||
* resolves an issue with serialization due to the
|
||||
* InternationalStringType data of the obj having odd
|
||||
* classnames.
|
||||
*/
|
||||
RegistryObjectType objClone = new RegistryObjectType(
|
||||
obj.getId(), obj.getLid(), obj.getObjectType(),
|
||||
obj.getOwner(), obj.getStatus(), obj.getName()
|
||||
.toString(), obj.getDescription().toString());
|
||||
objClone.setSlot(obj.getSlot());
|
||||
objClone.setVersionInfo(obj.getVersionInfo());
|
||||
RemoveRegistryEvent event = new RemoveRegistryEvent(
|
||||
request.getUsername(), obj.getId(), obj);
|
||||
request.getUsername(), obj.getId(), objClone);
|
||||
|
||||
event.setAction(Action.DELETE);
|
||||
event.setLid(obj.getLid());
|
||||
event.setObjectType(objectType);
|
||||
|
|
@ -762,7 +777,8 @@ public class LifecycleManagerImpl implements LifecycleManager {
|
|||
|
||||
private void mergeObjects(RegistryObjectType newObject,
|
||||
RegistryObjectType existingObject) {
|
||||
DeleteSlotEvent deleteSlotEvent = new DeleteSlotEvent(existingObject.getSlot());
|
||||
DeleteSlotEvent deleteSlotEvent = new DeleteSlotEvent(
|
||||
existingObject.getSlot());
|
||||
registryObjectDao.merge(newObject, existingObject);
|
||||
EventBus.publish(deleteSlotEvent);
|
||||
}
|
||||
|
|
@ -860,5 +876,5 @@ public class LifecycleManagerImpl implements LifecycleManager {
|
|||
public void setXpathProcessor(RegistryXPathProcessor xpathProcessor) {
|
||||
this.xpathProcessor = xpathProcessor;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue