Richard Peter
|
b5fa843960
|
Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]
Former-commit-id: 17196b5dcd
Former-commit-id: f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]
Former-commit-id: ff87317bd4
|
2014-04-14 13:10:11 -05:00 |
|
Richard Peter
|
56089894f2
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 9b12d9ddaf [formerly cd51f3fa87] [formerly a65804787550135ce5e8efc80b04f65f82ceff22 [formerly 3575d6586f]] [formerly 21ae3b5fcd [formerly 3575d6586f [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]]]
Former-commit-id: 21ae3b5fcd
Former-commit-id: 9377474013cb8e8722b3a32e83523c417b87fcd0 [formerly a7ec0bcf66]
Former-commit-id: d65b11d404
|
2014-04-11 16:23:09 -05:00 |
|
David Gillingham
|
c4fdc05b47
|
Issue #2915: Rewrite TextDBStaticData class.
Change-Id: I078f9c4a35e0477ee1248bb66f449d7fe4b165a1
Former-commit-id: c58abadccf [formerly 6d4860bae7] [formerly 60eed5d8473fcd9ea0fdbb8a81c5e151590f1f5d [formerly 6124d62120]] [formerly 9f50f29a67 [formerly 6124d62120 [formerly b27d83cc5123d08de450a45edb40ea722fc95c58]]]
Former-commit-id: 9f50f29a67
Former-commit-id: e886de0af490896aa21f704d4656e71af2bebbef [formerly c899410f7b]
Former-commit-id: b8e61e2cb6
|
2014-04-02 13:57:56 -05:00 |
|
David Friedman
|
1e4ac84f99
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
|
2014-03-27 19:17:03 +00:00 |
|
David Friedman
|
07828421c2
|
ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5
Former-commit-id: 4492bf353d [formerly fd203b5999] [formerly 15ca9f4dcc] [formerly decdadce01 [formerly 15ca9f4dcc [formerly 0a94094f0f140de68da634cbc6c79039507712ca]]]
Former-commit-id: decdadce01
Former-commit-id: 47dd084f53fe1100ab28828ac109cf98015fb0a1 [formerly 9beaf9be16]
Former-commit-id: f19895db07
|
2014-03-18 13:12:40 +00:00 |
|
Steve Harris
|
edeb1833ae
|
Merge branch 'omaha_14.2.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]
Former-commit-id: f60aba35d6
Former-commit-id: dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]
Former-commit-id: c24108e75b
|
2014-03-07 15:43:40 -06:00 |
|
Mike Duff
|
a8714addc5
|
Issue #2876 - Pluginize NDM
review comments
Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d
Former-commit-id: 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]
Former-commit-id: c388cb839b
Former-commit-id: 9aea84fb4bf8ca5374b8bd4488c02898ee308de8 [formerly 7bb9ada00d]
Former-commit-id: 12ea05cffc
|
2014-03-07 12:47:46 -06:00 |
|
Steve Harris
|
d2a6b0c18b
|
Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
edexOsgi/build.edex/esb/conf/log4j-ingest.xml
edexOsgi/build.edex/esb/conf/log4j-registry.xml
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]
Former-commit-id: 587f15a95d
|
2014-03-06 08:39:43 -06:00 |
|
Brian.Dyke
|
5a11fbbfdb
|
OB_14.1.1-19 baseline
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]
Former-commit-id: c41dd22ff2
|
2014-02-21 06:50:59 -05:00 |
|
Slav Korolev
|
164665bbac
|
Issue #2652. Fixed issue with edex-text-ingest log. Deleted unused code.
Change-Id: Id84e813047342a49988f78c1c9e13c356305e11b
Former-commit-id: 39e49448ba [formerly f7a6a6c613] [formerly a597ac0989] [formerly 3b1ea13cb1 [formerly a597ac0989 [formerly 7b666c5fb7a1cb459a90bb295e58491a9a21063c]]]
Former-commit-id: 3b1ea13cb1
Former-commit-id: eb29cf1af1a77f7e96c773b8304d91c618f49609 [formerly 8ec2d02f52]
Former-commit-id: 06d55c28f4
|
2014-02-19 12:01:06 -05:00 |
|
Michael Gamazaychikov
|
af698fa0f4
|
ASM #75
Change-Id: If2e1c8bc2d320b3681f64d8637fbabb9659d0c5b
Former-commit-id: 94cd48fa70 [formerly 2c2b629206] [formerly 91c3468462] [formerly edbadf059e [formerly 91c3468462 [formerly e726b2a3a2529f5909acb7fe0f9a3b8475f1642e]]]
Former-commit-id: edbadf059e
Former-commit-id: ecf011705fb1cc4ffbdc9997beea53ea907403ab [formerly e3cb50bdbe]
Former-commit-id: ad27feeedc
|
2014-01-29 14:19:52 -05:00 |
|
Nate Jensen
|
0509e362b9
|
Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15
Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]
Former-commit-id: b767760a9c
Former-commit-id: 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]
Former-commit-id: 93713d9698
|
2013-07-18 09:53:53 -05:00 |
|
Max Schenkelberg
|
f025c05d04
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
43bb696901
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]
Former-commit-id: 640b022e84
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
43b7a9b410
|
13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]
Former-commit-id: 0aab285b8a
|
2013-06-10 15:17:17 -04:00 |
|
Nate Jensen
|
3a41ae85b4
|
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]
Former-commit-id: b025262dc1
|
2013-05-29 14:49:43 -05:00 |
|
Nate Jensen
|
3b56918970
|
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
|
2013-05-23 11:20:40 -05:00 |
|
Nate Jensen
|
b8e6b1a083
|
Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31
Former-commit-id: 4ae00040e3 [formerly 65b9bafed7] [formerly d74936ef3e] [formerly d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]]
Former-commit-id: d7b8e04bb7
Former-commit-id: c6fc510360ab5dfd2d963fcd65966cfc3d7993fa [formerly 91c8b9ac1d]
Former-commit-id: 882296f823
|
2013-05-23 10:06:28 -05:00 |
|
Steve Harris
|
1d1791b3b4
|
13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]
Former-commit-id: 8ed6a53113
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
7fcbb49a3e
|
12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f] [formerly 2d0c424713] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031]
Former-commit-id: 725b2f8ba5
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
d9faed979f
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]
Former-commit-id: 7fb0b17bd5
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
e528bb0df2
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]
Former-commit-id: dc50bc8443
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
1f521a70b3
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
98d8b3f188
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
fa4cd88c90
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9bb8decbcf
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
|
2012-01-06 08:55:05 -06:00 |
|