Commit graph

12 commits

Author SHA1 Message Date
Richard Peter
705339a320 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 2c753c427c [formerly 79bdd34f4f] [formerly 2c753c427c [formerly 79bdd34f4f] [formerly 0074b774f0 [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]]
Former-commit-id: 0074b774f0
Former-commit-id: b4aac09ff4 [formerly 96b4944b41]
Former-commit-id: e2a16fd876
2013-11-14 14:40:23 -06:00
Bryan Kowal
cfb3717a61 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: b2272ad695 [formerly a51231058a] [formerly b2272ad695 [formerly a51231058a] [formerly e3639da703 [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]]
Former-commit-id: e3639da703
Former-commit-id: b2c63727ba [formerly 48d5d8c3a1]
Former-commit-id: a575f41589
2013-11-12 19:57:25 -06:00
Bryan Kowal
c9a29b19ff Issue #2163 - fix Eclipse CDT metadata after merge
Former-commit-id: ea4cbc4c9a [formerly 351824fb85] [formerly ea4cbc4c9a [formerly 351824fb85] [formerly b88a13d3b5 [formerly 7502d12a78c68f56e33a41bae7b3346d195ad79f]]]
Former-commit-id: b88a13d3b5
Former-commit-id: 1918d5e96a [formerly 4670dcb9a7]
Former-commit-id: 8e1df0bda0
2013-09-04 14:49:47 -05:00
Bryan Kowal
3daf51dacf Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 5bcf751c50 [formerly 9db548db3e] [formerly 5bcf751c50 [formerly 9db548db3e] [formerly 326cae8be4 [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]]
Former-commit-id: 326cae8be4
Former-commit-id: 98e4f44a7d [formerly 573aeaa238]
Former-commit-id: 929e30a520
2013-09-04 10:08:21 -05:00
Steve Harris
6c258a0b7c 13.5.1-18 baseline
Former-commit-id: d931b80e70 [formerly afb34814dd] [formerly d931b80e70 [formerly afb34814dd] [formerly 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]]]
Former-commit-id: 0a7acf96c7
Former-commit-id: 261b1da9d6 [formerly 2f9aa87a9f]
Former-commit-id: cde7f2a59c
2013-08-22 09:12:43 -04:00
Bryan Kowal
7bcb1f4407 Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions.
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts

Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17

Former-commit-id: 7e61461e86 [formerly 3eaacdb522] [formerly 7e61461e86 [formerly 3eaacdb522] [formerly 2e1a8eb2b3 [formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: 18c9026455 [formerly 5c0af47d6d]
Former-commit-id: 6f246409fd
2013-08-19 12:06:30 -05:00
Steve Harris
52564dc43c Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	nativeLib/edex_com/.cproject

Former-commit-id: 3f8cc1daf3 [formerly 8484f03bb8] [formerly 3f8cc1daf3 [formerly 8484f03bb8] [formerly 891f00d650 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 2681f1f045 [formerly 44251fd949]
Former-commit-id: e2a322158b
2013-08-15 12:50:08 -05:00
Bryan Kowal
73b3a1faa2 Issue #2257 - updated edex_com to use the qpid 0.18 messaging api
- created the new awips2-qpid-lib rpm
- removed the ldm dependendency on awips2-notification (ldm still uses qpid 0.7)
- qpid 0.7 libraries are now packaged with ldm
- Amend: update the 32-bit build configurations
- Amend: improve error handling in the EdexNotification cleanup function

Change-Id: Iee8ec98304a6b5aea0d11044dd8779d2afa100c3

Former-commit-id: ec0ef7fe80 [formerly fc8c3f540d] [formerly ec0ef7fe80 [formerly fc8c3f540d] [formerly 21893102bb [formerly af2882799bd08998d1321bac37beb2a7cecb4fb9]]]
Former-commit-id: 21893102bb
Former-commit-id: e76b46487c [formerly c2c9d745af]
Former-commit-id: d083f1ae4e
2013-08-14 11:21:33 -05:00
Bryan Kowal
2936104283 Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade.
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: 8ac250ca02 [formerly c5c9f4d30b] [formerly 8ac250ca02 [formerly c5c9f4d30b] [formerly a44a5d16e7 [formerly e317a0d7101182ad351f604cfc04ad0292773161]]]
Former-commit-id: a44a5d16e7
Former-commit-id: 3c1a1d7d9d [formerly 3fadaf976c]
Former-commit-id: b355324172
2013-07-29 13:50:33 -05:00
Steve Harris
2779f5c6d9 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: d9be4dce21 [formerly 47cc08ac79]
Former-commit-id: 547c1dedd1
2013-01-23 11:18:44 -05:00
Ben Steffensmeier
16b7863b52 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2

Former-commit-id: 808846e237 [formerly 944e59e989] [formerly 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]
Former-commit-id: f65d86a06a
Former-commit-id: 993f2aafa4 [formerly d00572c122]
Former-commit-id: 800e674078
2012-02-14 15:46:11 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00