Steve Harris
071a47944f
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 67ab6c135e
[formerly 5aac54b9f9
] [formerly 0ab03f2796
] [formerly 67ab6c135e
[formerly 5aac54b9f9
] [formerly 0ab03f2796
] [formerly 83d2194a5a
[formerly 0ab03f2796
[formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]]]]
Former-commit-id: 83d2194a5a
Former-commit-id: eff76c3566
[formerly 771be074c0
] [formerly f7cdd9e73c5d19a1d50e670a5eeceaa5bc626e90 [formerly 0efff318b8
]]
Former-commit-id: a4fea6a1d532840bbb0cc77ad3e807e6be10e9b3 [formerly f5fc091e48
]
Former-commit-id: 6da47cfbdd
2013-10-30 12:36:53 -05:00
Steve Harris
e979d6caa1
13.5.3-2 baseline
...
Former-commit-id: 235d1f8583
[formerly c6d951b390
] [formerly 055783655b
] [formerly 235d1f8583
[formerly c6d951b390
] [formerly 055783655b
] [formerly 6d85d944a6
[formerly 055783655b
[formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]]]]
Former-commit-id: 6d85d944a6
Former-commit-id: fef629ce26
[formerly 0c17777164
] [formerly 08cfc6740d0a1f987b0743cf3f07ab435cbb6ddc [formerly aef0e828d2
]]
Former-commit-id: 33aa78b83a8657172de9ca0d0ef491a27006efe6 [formerly 1cc13c9992
]
Former-commit-id: e90722d781
2013-10-30 12:53:25 -04:00
Steve Harris
179be1638a
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
...
Former-commit-id: a474e60927
[formerly f04be86698
] [formerly 602f138493
] [formerly a474e60927
[formerly f04be86698
] [formerly 602f138493
] [formerly 972339d60f
[formerly 602f138493
[formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]]]]
Former-commit-id: 972339d60f
Former-commit-id: dd533f0bce
[formerly a444c93ee7
] [formerly 9a8e1c383979dad1eabd28f3f1501bac50b45b28 [formerly 4c0599bae8
]]
Former-commit-id: 9ec4de5036bebda97665c7c5c43fd0794ee9593d [formerly 0bf9020c49
]
Former-commit-id: f49a22bae2
2013-10-28 14:39:22 -05:00
Steve Harris
719dfc4763
13.5.3-1 baseline
...
Former-commit-id: 9577afee9e
[formerly 059083170d
] [formerly 1d8a2026f6
] [formerly 9577afee9e
[formerly 059083170d
] [formerly 1d8a2026f6
] [formerly 30f65c2858
[formerly 1d8a2026f6
[formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837
[formerly 06f5dcf801
] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0
]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c
]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Steve Harris
fc9955c2e0
Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.uf.viz.archive.feature/feature.xml
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
ncep/gov.noaa.nws.ncep.edex.plugin.gpd/res/spring/gpd-ingest.xml
ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/src/gov/noaa/nws/ncep/edex/plugin/ntrans/decoder/NtransDecoder.java
Former-commit-id: 116d3822ac
[formerly 64062fa355
] [formerly 702b66ee52
] [formerly 116d3822ac
[formerly 64062fa355
] [formerly 702b66ee52
] [formerly ca54ffaad1
[formerly 702b66ee52
[formerly 7233d9cff9df6668f967810d8bd09c99e4ad2807]]]]
Former-commit-id: ca54ffaad1
Former-commit-id: 426b0662dc
[formerly 6aab62b7b9
] [formerly 01e9c332c0bd50e8e46a912a79993920979d2cd9 [formerly 38e4e0c572
]]
Former-commit-id: d8a3fc1a40537d39f3e081ace8795d06803bc0f7 [formerly 3a2a83bc4b
]
Former-commit-id: 2864f20285
2013-10-25 10:51:42 -05:00
Steve Harris
e0d7e4cc22
13.5.2-13 baseline
...
Former-commit-id: e755dbb114
[formerly ba50a26e70
] [formerly 2100a15013
] [formerly e755dbb114
[formerly ba50a26e70
] [formerly 2100a15013
] [formerly e7b1702032
[formerly 2100a15013
[formerly f931b3b75bd2581c8942b43d73dff02de4362ecf]]]]
Former-commit-id: e7b1702032
Former-commit-id: a2442a8e39
[formerly 96c50ba394
] [formerly 96aa43a7d3c8df257077a396b7cc0804a594105a [formerly bc3eff506b
]]
Former-commit-id: 1340f052e588a7cd26a7455f448e5f92f5304a57 [formerly 6bff2d159f
]
Former-commit-id: c71631dd28
2013-10-25 10:06:56 -04:00
Steve Harris
d1c823fe65
13.5.2-12 baseline
...
Former-commit-id: 845d49e370
[formerly e2b9baf2ed
] [formerly a532896473
] [formerly 845d49e370
[formerly e2b9baf2ed
] [formerly a532896473
] [formerly bcb531e671
[formerly a532896473
[formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198
[formerly 15d9848170
] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d
]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f
]
Former-commit-id: f97c128cc8
2013-10-25 09:59:15 -04:00
Steve Harris
4cfed2d3dd
13.5.2-11 baseline
...
Former-commit-id: e67aaa07b7
[formerly 9215a213a1
] [formerly b820a28276
] [formerly e67aaa07b7
[formerly 9215a213a1
] [formerly b820a28276
] [formerly cbfde2f52a
[formerly b820a28276
[formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83
[formerly ecad06c80d
] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72
]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e
]
Former-commit-id: d63a07d248
2013-10-25 09:45:58 -04:00
Roger Ferrel
ed0605940b
Issue #2478 Make database archive date format thread safe.
...
Change-Id: I0b864b5678ce60c88dfc6bb19857d97421a9e5f6
Former-commit-id: 6f62c2c226
[formerly 64b20ed2b3
] [formerly 1551a51954
] [formerly 6f62c2c226
[formerly 64b20ed2b3
] [formerly 1551a51954
] [formerly 65b11b22b4
[formerly 1551a51954
[formerly a33202aa75cc3ba5be71288c3dd49bb395535826]]]]
Former-commit-id: 65b11b22b4
Former-commit-id: 50e00ff50a
[formerly f809ada9c2
] [formerly 6ca39d866e473596e1e69d707aa06c3d0413494a [formerly 613ae43736
]]
Former-commit-id: 996fa64ab9e8ca8676561c88efe41acfbea57e8d [formerly ab39213204
]
Former-commit-id: 7ab2a18fc0
2013-10-23 16:23:50 -05:00
Dave Hladky
2ea5c157b2
Issue #2466 Returned to original harvesterThreadPool
...
Change-Id: Ia894f9e0330b1ae6f89a3bd3496e25085ad90b5d
Former-commit-id: 0c8360db45
[formerly 73aa2c69ac
] [formerly 1c37f0f765
] [formerly 0c8360db45
[formerly 73aa2c69ac
] [formerly 1c37f0f765
] [formerly beb0e573c1
[formerly 1c37f0f765
[formerly 534a6e392dab175f4e683af522c5e800cbb1391d]]]]
Former-commit-id: beb0e573c1
Former-commit-id: b57cadd40a
[formerly ef46aa1575
] [formerly 71bbc39b27da704277849a3577ea2b6de0371e48 [formerly 06ad289dc9
]]
Former-commit-id: 6f6a4e31ad3b70a836d935114ff38be603612650 [formerly 2453019703
]
Former-commit-id: 1eac3e62a0
2013-10-21 12:40:37 -05:00
Steve Harris
ccf5593d6f
Merge branch 'master_13.5.3' into omaha_13.5.3
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: d455ad79ce
[formerly 1581adfa64
] [formerly 852c02c848
] [formerly d455ad79ce
[formerly 1581adfa64
] [formerly 852c02c848
] [formerly 545d7ca463
[formerly 852c02c848
[formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]]
Former-commit-id: 545d7ca463
Former-commit-id: cc5e19f181
[formerly 2f0968a279
] [formerly 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc
]]
Former-commit-id: ec984ebc0429ce76175c36247419724dd543f7d7 [formerly 714ebfb6d0
]
Former-commit-id: cb671862ff
2013-10-14 09:28:24 -05:00
Steve Harris
07cacc9234
13.5.2-10 baseline
...
Former-commit-id: 2f59153a18
[formerly 1efbba7a4b
] [formerly 46c351de6c
] [formerly 2f59153a18
[formerly 1efbba7a4b
] [formerly 46c351de6c
] [formerly c3d29c0fa0
[formerly 46c351de6c
[formerly 83863a9833f309203af0ee34d503bf280e596397]]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 99dac05b85
[formerly d1f38eb936
] [formerly 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81
]]
Former-commit-id: 515de7689b19f5b8b1400a09fd953e907cea786f [formerly b74898370f
]
Former-commit-id: 03953804b3
2013-10-14 09:59:31 -04:00
Steve Harris
fc43a80ca0
13.5.2-9 baseline
...
Former-commit-id: 0093ce47a8
[formerly fdbef0e663
] [formerly a28a2d3041
] [formerly 0093ce47a8
[formerly fdbef0e663
] [formerly a28a2d3041
] [formerly f36cf09d21
[formerly a28a2d3041
[formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]]
Former-commit-id: f36cf09d21
Former-commit-id: 13873d55c2
[formerly 7d0416293f
] [formerly 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3
]]
Former-commit-id: 51425d8f2a233b5ad1bc16c34fa214aa28906053 [formerly be3a804cf5
]
Former-commit-id: 2dc7de0754
2013-10-10 10:55:20 -04:00
Richard Peter
3f32cc7a8b
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b
[formerly f0c05dc6d8
] [formerly 31c87ab01e
] [formerly f84e84989b
[formerly f0c05dc6d8
] [formerly 31c87ab01e
] [formerly d9eae3ea28
[formerly 31c87ab01e
[formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a
[formerly 94d0913bd9
] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50
]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247
]
Former-commit-id: d321c61259
2013-10-08 09:45:27 -05:00
Steve Harris
90889f8aa3
13.5.2-8 baseline
...
Former-commit-id: 553238dca4
[formerly 8ba7d392d6
] [formerly 94aa71fcd1
] [formerly 553238dca4
[formerly 8ba7d392d6
] [formerly 94aa71fcd1
] [formerly 18325949fb
[formerly 94aa71fcd1
[formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96
[formerly 21b84f0290
] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9
]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7
]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Roger Ferrel
ae869d0bd8
Issue #2326 Added user roles for Archive case and retention.
...
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967
Former-commit-id: 8ddb8ca55b
[formerly c959cedd99
] [formerly 7f7064d457
] [formerly 8ddb8ca55b
[formerly c959cedd99
] [formerly 7f7064d457
] [formerly 42705e4dfa
[formerly 7f7064d457
[formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 91b64293fe
[formerly 220769dab0
] [formerly 00c2406d52accdc4576d75bc6b343c8f99e96c0a [formerly 4c27adcc53
]]
Former-commit-id: 73f8bad6e41b1181298090e56e125f8939db1f69 [formerly 029eec5dc4
]
Former-commit-id: 7bb7770fbf
2013-10-03 12:33:26 -05:00
Bryan Kowal
3b0e12457a
Issue #2295 - CAVE updates for ALR
...
- Amend: relocated qpid connection string comment
- Amend: replaced stacktrace printing with UFStatus
- Amend: removed unused code
- Amend: ThinClientNoficationManagerJob JavaDoc
Change-Id: I091aa29700378149e8eb09dcd11cdfc020e96c76
Former-commit-id: 763aad00be
[formerly 4342c463b2
] [formerly aa8691edfd
] [formerly 763aad00be
[formerly 4342c463b2
] [formerly aa8691edfd
] [formerly 4e4405b0f5
[formerly aa8691edfd
[formerly 5a76eabc142619df4c8454c3f2fe93f5283346db]]]]
Former-commit-id: 4e4405b0f5
Former-commit-id: 9d5ae53748
[formerly 6c60d06f9f
] [formerly 9e8c3c5c60478955cb21f639fe96dd7e71b8a6e0 [formerly a727bf3927
]]
Former-commit-id: 09eb38934521a07d3d49532275423945bfefbb8f [formerly 4ce26acc3b
]
Former-commit-id: 767466a8fe
2013-10-02 15:49:17 -05:00
Bryan Kowal
638baff715
Issue #2272 - EDEX updates for ALR
...
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically
Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369
Former-commit-id: 5ffff05346
[formerly 60c544c7a9
] [formerly 26cf5dad60
] [formerly 5ffff05346
[formerly 60c544c7a9
] [formerly 26cf5dad60
] [formerly 73690a97aa
[formerly 26cf5dad60
[formerly d1f201a579b9a0421295df26c9ad17717581073f]]]]
Former-commit-id: 73690a97aa
Former-commit-id: 7fb399245e
[formerly 6162beb8e0
] [formerly 232a8e4ea04337a2838adc508ab6d0ba1d969176 [formerly 86e0b3480f
]]
Former-commit-id: 786c992a118444a64bf3d9fc4012ded979ecc3e5 [formerly 6db57eb23e
]
Former-commit-id: 58ed2e7ae7
2013-10-02 15:49:16 -05:00
Roger Ferrel
9635ebf647
Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
...
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859
Former-commit-id: 0c9b15df71
[formerly 2ba7117d13
] [formerly a76fc08e93
] [formerly 0c9b15df71
[formerly 2ba7117d13
] [formerly a76fc08e93
] [formerly e65b8a9f6e
[formerly a76fc08e93
[formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: a6316240e5
[formerly 34ea90f18a
] [formerly a2267cf171606a2eb1d0fafc1259f9998139b1a7 [formerly 71737f069d
]]
Former-commit-id: 43c9bb837f60460e0ee95d90741e92a50a1a3384 [formerly 0d86e00182
]
Former-commit-id: efde4f9297
2013-10-01 16:36:34 -05:00
Richard Peter
b7f12fd06f
Merge "Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive." into omaha_13.5.3
...
Former-commit-id: d42c70b457
[formerly 5a3d77f26f
] [formerly 463c07c3de
] [formerly d42c70b457
[formerly 5a3d77f26f
] [formerly 463c07c3de
] [formerly 59061263d2
[formerly 463c07c3de
[formerly 3180544d195f49196e842ddf68d1dd6f71872b18]]]]
Former-commit-id: 59061263d2
Former-commit-id: be160753c6
[formerly 33a53e5b2a
] [formerly 5f8a32532e78cbb0c9686f7ba34b352df06ead58 [formerly 7309d7d836
]]
Former-commit-id: e3644bc4bb2123bfc7d9a43c4ec4ea96d57f5844 [formerly 2a86df5796
]
Former-commit-id: 541ff7c791
2013-10-01 15:31:12 -05:00
Richard Peter
ec9e48704b
Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.vm
edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/mileMarkers.xml
Former-commit-id: 1eb943d331
[formerly 984785ce5e
] [formerly e45689dbc7
] [formerly 1eb943d331
[formerly 984785ce5e
] [formerly e45689dbc7
] [formerly add32a774f
[formerly e45689dbc7
[formerly b118718cd8766cf83df1a02079f92636964ca09e]]]]
Former-commit-id: add32a774f
Former-commit-id: 64d062aa4b
[formerly aa2eda2c38
] [formerly 346bf1cefacad9a336319ff9af04ac8832f33e41 [formerly c178e4543a
]]
Former-commit-id: e210fa8935d6faf05e7b000811df47d3a19ffb19 [formerly 06737e3fa2
]
Former-commit-id: 32dd0fedc1
2013-10-01 14:22:33 -05:00
Roger Ferrel
d1f17de341
Issue #2147 Changes to properly place gfe files in /awips2/edex/data/archive.
...
Change-Id: I00ab0a44e37d4e9898aa256f4963c34ed8ae1f48
Former-commit-id: 6f87e4d4ff
[formerly 93ce65763e
] [formerly e8be9f980a
] [formerly 6f87e4d4ff
[formerly 93ce65763e
] [formerly e8be9f980a
] [formerly 546c051e35
[formerly e8be9f980a
[formerly 482b253e94e069ae82507e22a94213342b1b92e6]]]]
Former-commit-id: 546c051e35
Former-commit-id: 55931d93af
[formerly 3466232f8d
] [formerly 3bfae98b1f8082ff8a68fadd0ca1886140657bbf [formerly f01f8e9eb4
]]
Former-commit-id: 3cdfa687304fb07dfa424ab4da65b9f89ee2d18e [formerly 213127601d
]
Former-commit-id: d5626a0591
2013-09-30 16:45:32 -05:00
Steve Harris
08f26c03de
13.5.2-7 baseline
...
Former-commit-id: cbda847929
[formerly b5cb693619
] [formerly 0f8fc513bf
] [formerly cbda847929
[formerly b5cb693619
] [formerly 0f8fc513bf
] [formerly a212c30bd7
[formerly 0f8fc513bf
[formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae
[formerly 06ba0dbf6c
] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782
]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974
]
Former-commit-id: 79d71e33d0
2013-09-30 13:05:31 -04:00
Richard Peter
4c13941b69
Merge branch 'omaha_13.5.2' (omaha_13.5.2-6) into omaha_13.5.3
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
Former-commit-id: 7455465049
[formerly 3d7af2ceb3
] [formerly 4a32664d5e
] [formerly 7455465049
[formerly 3d7af2ceb3
] [formerly 4a32664d5e
] [formerly 3a859792ae
[formerly 4a32664d5e
[formerly 8b80beb42d0a76cd158857df7f497c6eff874fe1]]]]
Former-commit-id: 3a859792ae
Former-commit-id: dfb715e11d
[formerly aec4ec7f57
] [formerly 7c7e5dd7ecae21accce3a2f34c8a3e82d717f105 [formerly 59e41094a8
]]
Former-commit-id: d9ddce3b006e0fcc02308b6db415af3288ff041e [formerly f30858c9c4
]
Former-commit-id: 3533071e9a
2013-09-24 12:57:48 -05:00
Richard Peter
468ef4815e
Merge branch 'omaha_13.5.1.1' (omaha_13.5.1.1-4) into omaha_13.5.2
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/build.edex/esb/data/utility/common_static/base/ncep/hold/NcInventoryDefinitions/FFG_TIR_HIRES.xml
ncep/gov.noaa.nws.ncep.edex.plugin.geomag/res/spring/geomag-ingest.xml
Former-commit-id: fb9a34e22a
[formerly 4b934caa41
] [formerly 92a45d77bb
] [formerly fb9a34e22a
[formerly 4b934caa41
] [formerly 92a45d77bb
] [formerly 271a8d753e
[formerly 92a45d77bb
[formerly 14284eb34f246c2d283ecf4040996957d7117cd3]]]]
Former-commit-id: 271a8d753e
Former-commit-id: 18268737b4
[formerly f23ea6e3ad
] [formerly ad0c7e3be1948e8e01580b87275262dcbd92b650 [formerly 83dc5197a1
]]
Former-commit-id: 67070831ebbb7c757e283b249d2ba402f461a1ef [formerly a00ad51154
]
Former-commit-id: 57d31708f7
2013-09-24 12:29:16 -05:00
Nate Jensen
2eca79cd1c
Merge "Issue #2368 : Fix grib-decode.xml for future case" into omaha_13.5.1.1
...
Former-commit-id: c2cef026ce
[formerly 9e5c4ee11e
] [formerly a195e02b08
] [formerly c2cef026ce
[formerly 9e5c4ee11e
] [formerly a195e02b08
] [formerly e50aa8d7d7
[formerly a195e02b08
[formerly cc0207ec34b50ec2331e1d469153fd29a7be22ae]]]]
Former-commit-id: e50aa8d7d7
Former-commit-id: 8d7ed6d623
[formerly 7ce26fd622
] [formerly 543eef60741c638ba1d906ecf5b92dff8a87bc41 [formerly 35628f0569
]]
Former-commit-id: 0338e5a90afd7fd45f2fdbfb7b793b11932da4e3 [formerly 8f60afd82a
]
Former-commit-id: 29ea4b995f
2013-09-23 12:45:23 -05:00
Steve Harris
fc81b0b40d
Merge branch 'master_13.5.2' into omaha_13.5.2
...
Former-commit-id: 764a0e17fc
[formerly a10bee00ae
] [formerly 739b04fffd
] [formerly 764a0e17fc
[formerly a10bee00ae
] [formerly 739b04fffd
] [formerly 6a803c0d62
[formerly 739b04fffd
[formerly 45d3f23423b8e335de508a6a0a791274ce6ba77a]]]]
Former-commit-id: 6a803c0d62
Former-commit-id: 20770b941e
[formerly 969e0bb52f
] [formerly ef59f6f61375525b57357e8da466fc9be36ce6e5 [formerly cbc396a12c
]]
Former-commit-id: 420ecec5877c0b9643ddd33a72fbbf01d87eee21 [formerly 7c781e9e88
]
Former-commit-id: 2fdf959174
2013-09-23 12:02:31 -05:00
Steve Harris
02b8ab0d37
13.5.1.1-4 baseline
...
Former-commit-id: 0c4b4f2f51
[formerly 87ffb2c668
] [formerly f58a17c8b3
] [formerly 0c4b4f2f51
[formerly 87ffb2c668
] [formerly f58a17c8b3
] [formerly f578f90a0b
[formerly f58a17c8b3
[formerly 128f9c8e0e2d3706c39e259170b049a6c234be4c]]]]
Former-commit-id: f578f90a0b
Former-commit-id: 67ed2fc19d
[formerly c064642520
] [formerly b3bfca724ab629a7b529f58c2d03601146435010 [formerly a8f762e8d3
]]
Former-commit-id: abe0e03546b5fb668687ca7c296af549c25c0854 [formerly 28025d3bc5
]
Former-commit-id: 85c17df4fd
2013-09-23 10:29:32 -04:00
Steve Harris
7a3a7dad35
13.5.1.1-3 baseline
...
Former-commit-id: 265a5590e8
[formerly a4bb855c1f
] [formerly 1f4c8f317f
] [formerly 265a5590e8
[formerly a4bb855c1f
] [formerly 1f4c8f317f
] [formerly 06694a32ce
[formerly 1f4c8f317f
[formerly 5f5672a32c95941d8a75d55dc99859f1f9585167]]]]
Former-commit-id: 06694a32ce
Former-commit-id: 2dd9ca8a3b
[formerly d5b52526dd
] [formerly f13d7e2356ec3c932f6677d1ad5f0531e834f27c [formerly 62643f0d21
]]
Former-commit-id: eb01ac554299cfc49820025dca5a9a14eac69500 [formerly d373001933
]
Former-commit-id: 8dabb9609b
2013-09-23 10:16:44 -04:00
Steve Harris
6e9e71c2c6
13.5.2-6 baseline
...
Former-commit-id: 3cb4574635
[formerly 059549438a
] [formerly 3821475d4e
] [formerly 3cb4574635
[formerly 059549438a
] [formerly 3821475d4e
] [formerly 3837fbe670
[formerly 3821475d4e
[formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329
[formerly 557a7c87d5
] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd
]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43
]
Former-commit-id: b7b8d4a0b7
2013-09-23 10:03:15 -04:00
Richard Peter
01707983fb
Issue #2368 : Fix grib-decode.xml for future case
...
Former-commit-id: 4be46da036
[formerly 204d93eaa1
] [formerly 0edd9da1bd
] [formerly 4be46da036
[formerly 204d93eaa1
] [formerly 0edd9da1bd
] [formerly 0e23b3749d
[formerly 0edd9da1bd
[formerly e3109abc996557301b6c91773b6841e6dc22c272]]]]
Former-commit-id: 0e23b3749d
Former-commit-id: c0a4a1b5df
[formerly 16ca3e00aa
] [formerly c9b5ddd2c70d3279345fef69f47a8a8d299971cb [formerly ecf595edb0
]]
Former-commit-id: 3dd797d3e03398edd110bb1eed2a2a464862ed4b [formerly def1d76d45
]
Former-commit-id: 5d0d379a49
2013-09-22 22:02:19 -05:00
Richard Peter
a1c5a48f78
Issue #2327 : Fix feature issue
...
Former-commit-id: c374ed9691
[formerly f6362dc057
] [formerly 13d85bdbbf
] [formerly c374ed9691
[formerly f6362dc057
] [formerly 13d85bdbbf
] [formerly ace74679c2
[formerly 13d85bdbbf
[formerly e6bd44d5ab29eae72a9c576e37513ac3dcff596e]]]]
Former-commit-id: ace74679c2
Former-commit-id: 789b55844b
[formerly 9dd8ca892d
] [formerly 168a3ad445cd926e8ee1e4a0715fc89da94cc2b5 [formerly 5f1f93ee3c
]]
Former-commit-id: 8e06d97228ce924276b61534d4bacd7b2c2f81d9 [formerly 5f0ca6d49e
]
Former-commit-id: 0f56d83084
2013-09-19 11:44:54 -05:00
Richard Peter
c70b4ba829
Issue #2327 : Fix build dependency
...
Former-commit-id: c832c13002
[formerly 945af65f60
] [formerly bddc73d43c
] [formerly c832c13002
[formerly 945af65f60
] [formerly bddc73d43c
] [formerly 08d0ed49bf
[formerly bddc73d43c
[formerly 2aaac1cd2031021b34f1cdf852b476196d810268]]]]
Former-commit-id: 08d0ed49bf
Former-commit-id: 43f2ef2fa0
[formerly 49a8c72819
] [formerly d53e343b461ced096bf2b383c13284181e8b6f65 [formerly 1a44e0eacd
]]
Former-commit-id: 8d7fea0c34ce412931d77df76c2a5453a07de22a [formerly 8fd49f0374
]
Former-commit-id: cf97762209
2013-09-19 11:44:28 -05:00
Richard Peter
738db50767
Issue #2327 : Manual ingest now routes by plugin
...
Change-Id: I7627049a4881ecaa572c0f4e86d31092ce79871e
Former-commit-id: c9853d3736
[formerly 93c51b648c
] [formerly c64e1ecae3
] [formerly c9853d3736
[formerly 93c51b648c
] [formerly c64e1ecae3
] [formerly 7dd9dc40fd
[formerly c64e1ecae3
[formerly 311a74bbb65dc1fd8337ba9b004ec977da24a5f8]]]]
Former-commit-id: 7dd9dc40fd
Former-commit-id: de65c5d68b
[formerly 59cc0d8c69
] [formerly c4e6c4c6bd2da883882eeb0ffd0accdcf8a13cec [formerly e1573d6012
]]
Former-commit-id: e398bf6b8ba70edff07b645b3ebe84ba1b33dcae [formerly b2f656cb5a
]
Former-commit-id: 909892f7e2
2013-09-19 11:44:28 -05:00
Richard Peter
5168cb79b5
Issue #2368 : Fix durable jms configurations
...
Change-Id: I0167e5f0dd5caea72c5f4220979fd9b55375b3c4
Former-commit-id: 9fe5b9f098
[formerly ed7a62911e
] [formerly b6fd367b68
] [formerly 9fe5b9f098
[formerly ed7a62911e
] [formerly b6fd367b68
] [formerly 152d8654ef
[formerly b6fd367b68
[formerly f611b9afdf541b5fa632fe27755a69f16b871f68]]]]
Former-commit-id: 152d8654ef
Former-commit-id: 7b59c2ead2
[formerly e2a2d0c7cb
] [formerly bc5c9470456798683fb01d457c8ee304e9038020 [formerly d634b6fcc5
]]
Former-commit-id: 079b7d07dc50f62d70bf1315b22f16a2a71ea66c [formerly fa7813ee3a
]
Former-commit-id: 370b77fbf7
2013-09-18 21:20:54 -05:00
Roger Ferrel
fc47d0715d
Issue #2249 Add check for director when checking for file created by the TextEditorDialog.
...
Change-Id: Iede767fca5a720e1972c772f752bcf830f8c092b
Former-commit-id: 27efe780b1
[formerly f5fa113ded
] [formerly 604ff6a0dd
] [formerly 27efe780b1
[formerly f5fa113ded
] [formerly 604ff6a0dd
] [formerly b3b6ed29e6
[formerly 604ff6a0dd
[formerly bfa59e5de2ad0d6bb0625b275c43aede596cb2c2]]]]
Former-commit-id: b3b6ed29e6
Former-commit-id: a823ff4295
[formerly b1b5569fea
] [formerly 8561dbbdd1938439485705d35b48de34902c6190 [formerly ea4af16b2c
]]
Former-commit-id: 116348d305363a85f2a1cd50f40839d4d119c0b7 [formerly 59bd630295
]
Former-commit-id: 0aa18570fc
2013-09-18 14:11:38 -05:00
Ron Anderson
884d2b5cc7
Issue #2348 Fix leak of D2DGridDatabase objects.
...
Change-Id: Iaaf50d74798126335d114638b8ef2be88cf42a5d
Former-commit-id: 8598bf5eb2
[formerly 1c2da29a4d
] [formerly 60320a0f28
] [formerly 8598bf5eb2
[formerly 1c2da29a4d
] [formerly 60320a0f28
] [formerly 260a9ed866
[formerly 60320a0f28
[formerly e8ffd704cfccc7cd5f4a8298a488c3ac7d8c428d]]]]
Former-commit-id: 260a9ed866
Former-commit-id: e536d5f0aa
[formerly 163eb55f0f
] [formerly 4585b6cefb5c0d9b659b663054223df7905d972f [formerly e779f148b4
]]
Former-commit-id: 0198873d30e2e502bf9df4649bc0103319eac10a [formerly 6828fecf70
]
Former-commit-id: 23b2248877
2013-09-16 16:34:12 -05:00
Nate Jensen
2afb8264e9
Merge "Issue #2249 Changes to get simulated time from warngen ingest files." into omaha_13.5.3
...
Former-commit-id: 86ecc443b8
[formerly 9c6071c0fa
] [formerly f727434ae8
] [formerly 86ecc443b8
[formerly 9c6071c0fa
] [formerly f727434ae8
] [formerly 5e7221efe8
[formerly f727434ae8
[formerly 892a39d7fe4f328b7d09fb8d44cdfadef48ca3c7]]]]
Former-commit-id: 5e7221efe8
Former-commit-id: 4308f3079a
[formerly 312db0fffd
] [formerly 37446019a3103c21d0ebb9b6f3f9b494193929df [formerly 024afbe712
]]
Former-commit-id: 22627bc70ba57c93ed025e28951ced1e14850c9a [formerly 5cc048fb7d
]
Former-commit-id: fa90c2bcb2
2013-09-16 14:37:14 -05:00
Roger Ferrel
7ba2559fef
Issue #2249 change to data deliver feature.xml to get compress.
...
Change-Id: I0c22609730907d0037f438a2834b37730efa59fe
Former-commit-id: ed5bcc31dd
[formerly bfde6129bd
] [formerly dc13af26b5
] [formerly ed5bcc31dd
[formerly bfde6129bd
] [formerly dc13af26b5
] [formerly 9c63dc2cbb
[formerly dc13af26b5
[formerly ff6b35dab643add82563ce9f2e36fed0b09ef965]]]]
Former-commit-id: 9c63dc2cbb
Former-commit-id: 21c374fa99
[formerly 6405b9606b
] [formerly b8235991ce2a9ff8faa7ae2977520534d3cf9578 [formerly 60ef8a0420
]]
Former-commit-id: c236b073ab11562d889cec005547d0ba3c959f04 [formerly 9c19f09039
]
Former-commit-id: f9fb66ab82
2013-09-16 14:14:17 -05:00
Steve Harris
bbbcc661b7
13.5.2-5 baseline
...
Former-commit-id: dc60765dcb
[formerly 31111f4f52
] [formerly 0745317d53
] [formerly dc60765dcb
[formerly 31111f4f52
] [formerly 0745317d53
] [formerly 67cceefe5d
[formerly 0745317d53
[formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]]]]
Former-commit-id: 67cceefe5d
Former-commit-id: 4c4dd59711
[formerly c8ead44672
] [formerly 738f26259951c00c72cc70df42f55b887349b3ef [formerly 6202bacae1
]]
Former-commit-id: e26890a39b824d77b4f4c3c0acd1eed489865f1e [formerly c79546c83a
]
Former-commit-id: fb70a4b4b0
2013-09-16 10:14:25 -04:00
Richard Peter
d38773fc03
Issue #2368 : Update JMS routing to set message persistence and durability at the config level
...
Former-commit-id: 449692aeff
[formerly b803359eb4
] [formerly 5111debc92
] [formerly 449692aeff
[formerly b803359eb4
] [formerly 5111debc92
] [formerly a5a7816b98
[formerly 5111debc92
[formerly 9ac3d2ddbeee7265b9b7879fcc6efcee95281872]]]]
Former-commit-id: a5a7816b98
Former-commit-id: 21fb70a26a
[formerly db69f5b54a
] [formerly 30f0c6a3141bbd70f57d9187f7478aa7a8aecd56 [formerly bc169f0a04
]]
Former-commit-id: 4a8c427f1c11daaee6646c7b4ca27cb08a82416c [formerly 7fe0220024
]
Former-commit-id: 4effeb83ba
2013-09-15 13:44:17 -05:00
Bryan Kowal
e5fbcc1a09
Issue #2133 - qpid is now a wrapped java application; incremented qpid release
...
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf
Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58
Former-commit-id: 1ff8ab2db2
[formerly 1d0e58f85d
] [formerly d322c993c0
] [formerly 1ff8ab2db2
[formerly 1d0e58f85d
] [formerly d322c993c0
] [formerly f1cfc60a93
[formerly d322c993c0
[formerly 0a8dd30dc1937287561d7ae8a3073137d100fe4f]]]]
Former-commit-id: f1cfc60a93
Former-commit-id: 2e921da8c0
[formerly 2ed95acce0
] [formerly 0c09d4dd62d00cd7ab7654c3ae16063225321219 [formerly aae9f35b39
]]
Former-commit-id: 2b3058af237ed12c5aa1650ace786259842b5e19 [formerly ddd1e47e38
]
Former-commit-id: ffa598d3f9
2013-09-13 10:03:08 -05:00
Roger Ferrel
b2d087307c
Issue #2249 Changes to get simulated time from warngen ingest files.
...
Change-Id: Ib66d7eb678a29109ee1dd4328081e4f0d622af14
Former-commit-id: 4e976ef155
[formerly 2afd3523a4
] [formerly 46011b2b52
] [formerly 4e976ef155
[formerly 2afd3523a4
] [formerly 46011b2b52
] [formerly 6470b5d1ee
[formerly 46011b2b52
[formerly 45a70809cc891d2abb3e8587f0640669e579f351]]]]
Former-commit-id: 6470b5d1ee
Former-commit-id: de55b28e17
[formerly 772d7644b3
] [formerly 206d50895dc75dac28bd375b6b0a40894ab91a8e [formerly 372ab9e533
]]
Former-commit-id: b0a2ea02172fad1c1880db196cb27668db4e9b5e [formerly 1e1ba0b872
]
Former-commit-id: a80f58102c
2013-09-12 14:59:49 -05:00
Richard Peter
15e96a9994
Issue #2362 : Merge issues with initial cherry pick of Wes2Bridge DRs
...
Former-commit-id: df374f45aa
[formerly a0d6ce6dbb
] [formerly 4b6e4fcd3a
] [formerly df374f45aa
[formerly a0d6ce6dbb
] [formerly 4b6e4fcd3a
] [formerly da4faa645d
[formerly 4b6e4fcd3a
[formerly 89a61850616dd532fc81e7cdaefc9dcb360633f3]]]]
Former-commit-id: da4faa645d
Former-commit-id: 8279a8620d
[formerly f262ec5ea8
] [formerly 4265992ba4d533326336d2d9c8fb6ab8365193d2 [formerly deddf5cc1f
]]
Former-commit-id: e66954987492e44f0694ce9475b35ba7841bd054 [formerly 5a12a9ff69
]
Former-commit-id: f8041d0fba
2013-09-12 13:47:43 -05:00
Richard Peter
4f12c51144
Issue #2298 : Fix DataURIUtil calling setPluginName
...
Change-Id: Ic0ee254bcd61bad9a76179486b11ff15bff2d271
Former-commit-id: 8a398f11ad
[formerly bd94793415
] [formerly 75d2cd017e
] [formerly 8a398f11ad
[formerly bd94793415
] [formerly 75d2cd017e
] [formerly b0b544bcec
[formerly 75d2cd017e
[formerly 859fe815193d65c35c1c753153f8d93767abf414]]]]
Former-commit-id: b0b544bcec
Former-commit-id: 9c35ab2449
[formerly 52bef6ad53
] [formerly 03c722db879213db05890636220da9df203f0822 [formerly 0d133c3b26
]]
Former-commit-id: 0aed685a00104009c21348a890e07566828d91b3 [formerly e26d96b3ec
]
Former-commit-id: ee444c119c
2013-09-12 12:49:36 -05:00
Richard Peter
2c7bd50390
Issue #2298 : Remove setPluginName python calls.
...
Former-commit-id: 3e5a619134
[formerly 7d1cf6881e
] [formerly 6b93f9ad06
] [formerly 3e5a619134
[formerly 7d1cf6881e
] [formerly 6b93f9ad06
] [formerly 799fe37bca
[formerly 6b93f9ad06
[formerly b666f99d3dc79b90525177072e2448077c39545a]]]]
Former-commit-id: 799fe37bca
Former-commit-id: 613bae7e58
[formerly ebd65eb24f
] [formerly 674eec92387987ea077a8e65c63680244c9df5fb [formerly 8c9e5f214b
]]
Former-commit-id: dcfbbe8ee2f522207c4df7b1cc6514d6b74b18b9 [formerly 55616d1343
]
Former-commit-id: a2af133db0
2013-09-12 12:49:23 -05:00
Roger Ferrel
c1fe34415b
Issue #2224 Add enable flag to archive purger and move properties to plug-in.
...
Change-Id: I6fd80f4b5f1326a173bd8e980735781d9ec03898
Former-commit-id: 0685560166
[formerly ea812e4932
] [formerly af1be4b9a4
] [formerly 0685560166
[formerly ea812e4932
] [formerly af1be4b9a4
] [formerly dcfc88a94a
[formerly af1be4b9a4
[formerly b48e7521377834d9301ca058893f2a5293cc8d74]]]]
Former-commit-id: dcfc88a94a
Former-commit-id: e25d84d015
[formerly a2a7c78d88
] [formerly fa7e54ee39374861cf2751d092586f1a73c07a1a [formerly a2222ad404
]]
Former-commit-id: 19c1ab60e5f4d49bc6c7ed909a441962de4b5df3 [formerly 029f2e28b8
]
Former-commit-id: 200c0ffb2e
2013-09-12 12:49:10 -05:00
Richard Peter
2b02cee6ff
Issue #2298 : Make getPluginName abstract
...
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 04c64843dd
[formerly feeddb503f
] [formerly 41550aaf9f
] [formerly 04c64843dd
[formerly feeddb503f
] [formerly 41550aaf9f
] [formerly 80e7b265dd
[formerly 41550aaf9f
[formerly 0f939c3d1f89bf3463315528c1b47f5f49e2fa05]]]]
Former-commit-id: 80e7b265dd
Former-commit-id: ebd1861dbf
[formerly 744320a0ff
] [formerly 8730e09117da72755c56a49d5b1957697ffdfe1d [formerly 917a2d153f
]]
Former-commit-id: 5f8e897b4442bda1ab2cda9997dabe889ab3b83b [formerly 45f84d6889
]
Former-commit-id: da668e7cc9
2013-09-12 12:48:36 -05:00
Roger Ferrel
cd1087ad76
Issue #2224 Unit test now handles different time types and configuation changes.
...
Change-Id: I7f082b55ae112b1835ebdb516da85b2267e546e7
Former-commit-id: 56a36ae7a6
[formerly a3b5774a41
] [formerly c565c6e6be
] [formerly 56a36ae7a6
[formerly a3b5774a41
] [formerly c565c6e6be
] [formerly 633baeb268
[formerly c565c6e6be
[formerly a88d522a58297f399f2100195c01cf4c54b1f508]]]]
Former-commit-id: 633baeb268
Former-commit-id: 00d93b372f
[formerly 43f09e1e2b
] [formerly c25cdc7dd2dfc330008aff53e33c562c8a9e51f8 [formerly 0d3dbaf89b
]]
Former-commit-id: f27b252eaacf8307e3b3949ba4d2e417042fe25d [formerly fae2c26c47
]
Former-commit-id: 6995613915
2013-09-12 11:50:23 -05:00
Roger Ferrel
2f9e3c8a60
Issue #2299 fixed purger running ingest out of memory.
...
Change-Id: If1877049574fd546e90479f3c56feb94ffbe088a
Former-commit-id: e3bd59c39c
[formerly 7d9afba0db
] [formerly 1d71cf8beb
] [formerly e3bd59c39c
[formerly 7d9afba0db
] [formerly 1d71cf8beb
] [formerly 79d8c93563
[formerly 1d71cf8beb
[formerly f75af60ec46f734bd5e815eeeab2bc82d3436229]]]]
Former-commit-id: 79d8c93563
Former-commit-id: faf9adb163
[formerly 94e5a0eec0
] [formerly f5546f55ebd95b61923296a16ca36cc6351a85f0 [formerly 01b99b17a2
]]
Former-commit-id: 44b77b35377df3f723ab19dcc55490379c504f3f [formerly 5b5b2005e6
]
Former-commit-id: f4e99b457a
2013-09-12 11:50:02 -05:00