Commit graph

507 commits

Author SHA1 Message Date
Richard Peter
8e252f89f0 Merge branch 'master_13.4.1' into omaha_13.4.1
Former-commit-id: c40709229f [formerly 4809b3c15b] [formerly 73372622f7] [formerly 77a08ebd31 [formerly 73372622f7 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 38741ab6e09457ab781a256b369b5b60e307fc09 [formerly 427f54a878]
Former-commit-id: 21b87e9ea7
2013-05-21 10:35:00 -05:00
Steve Harris
5db95cce55 13.4.1-11 baseline
Former-commit-id: 65d8f51034 [formerly d6319a2ca6] [formerly 2edee36158] [formerly c0376ce9ed [formerly 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: d3627734c45f2b66baada7042aad74b4dccee3dc [formerly 6df093ef48]
Former-commit-id: 4d88863515
2013-05-21 09:19:25 -04:00
Steve Harris
ac83fff244 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]
Former-commit-id: 7e04d8cd13
2013-05-20 10:52:47 -04:00
Bryan Kowal
1e095fc20b Issue #2017 - edex-environment will now be dependent on awips2-qpid-java instead of qpid-java
Former-commit-id: dd508d5bdd [formerly db9b06cc9d] [formerly eb54fa14ad0ff4cfcc795a392370b390ab7327ac [formerly d8ce0f369c]] [formerly a070d28ecc [formerly d8ce0f369c [formerly 16613c208fee90c5a11b948f61f34e201402ff30]]]
Former-commit-id: a070d28ecc
Former-commit-id: 6bbd21751b1aa7bfaacb409592f0ad2110b3d569 [formerly 7dd9b1e1c0]
Former-commit-id: a52363e2df
2013-05-17 18:21:03 -05:00
Steve Harris
9b898a6478 Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: f9535abb10 [formerly 87a31f9990] [formerly 16ba74496d] [formerly b76d359695 [formerly 16ba74496d [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: 499736d4d7405319cf1c0593daa813e5d6e14ff6 [formerly 26664e6615]
Former-commit-id: b5d3ff1867
2013-05-16 13:45:58 -05:00
Bryan Kowal
fd6dec8c03 Issue #1872 - Merge 2002; ensure that there are not any .gitignore files in webapps or the esb deployment
Change-Id: I9d7a177b75ca1e4562cf73ebfee3fc15d99bc78e

Former-commit-id: 443fa1a125 [formerly 2149099abb] [formerly 7d4d2749ce57a39dd5830ef41c882fc46ec08cd7 [formerly 11c93f548e]] [formerly 43ec909008 [formerly 11c93f548e [formerly f90a3d048154641a2900fbe21de3e96db9f87aff]]]
Former-commit-id: 43ec909008
Former-commit-id: 134ed31084c1662f1e828cda0c3059ae2bb2adf0 [formerly 97cff7bf9c]
Former-commit-id: c03d61587c
2013-05-16 10:21:11 -05:00
Bryan Kowal
c7cd48449e Issue #1872 - merge 2002; do not include .gitignore files in the rpm
Former-commit-id: 34c87d5256 [formerly c83d93b527] [formerly b0122e794e] [formerly 20fd227d99 [formerly b0122e794e [formerly 25a995ec49f223eba1c81ce6d9da350c3f381607]]]
Former-commit-id: 20fd227d99
Former-commit-id: 125acc649473b68c049da6f9fe45530d4b3c3030 [formerly 7ec8600dc1]
Former-commit-id: 8cba03d5a5
2013-05-16 10:19:31 -05:00
Steve Harris
7d55d0e959 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]
Former-commit-id: 67a95d07d2
2013-05-16 11:12:07 -04:00
Nate Jensen
686ad54de8 Merge "Issue #2007 unpack plugins that have res/spring files" into omaha_13.4.1
Former-commit-id: 058e32d421 [formerly bb307ed685] [formerly 35830d317d] [formerly 7f9ef5ce98 [formerly 35830d317d [formerly 444b61ff0af4a687bdf7daab51a3b435f91f3829]]]
Former-commit-id: 7f9ef5ce98
Former-commit-id: 209109c17ddec84f38f3a259f5a4ad89242e92a2 [formerly 4c7b2d73d3]
Former-commit-id: dbe24d00fd
2013-05-15 14:00:15 -05:00
Nate Jensen
4b07083989 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: a0b1b9053a [formerly 86d3bf5a7c] [formerly 948e47a2c6] [formerly fecadf104b [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]
Former-commit-id: fecadf104b
Former-commit-id: 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8 [formerly ba3bda461c]
Former-commit-id: 9284c27ddd
2013-05-15 13:36:09 -05:00
Bryan Kowal
92db4c4121 Issue #1982 - awips2-qpid-java rpms will no longer be dependent on qpid-java rpms
Former-commit-id: e02ad5d555 [formerly e1794dd03f] [formerly f9e77e90b7] [formerly 0e3e3e891b [formerly f9e77e90b7 [formerly 1f656fbe0a267ace1dad3b22b3ef7ef1bd7c8d92]]]
Former-commit-id: 0e3e3e891b
Former-commit-id: 464ade86d03b34790349312571541113105fb8b1 [formerly 0af34bbe4c]
Former-commit-id: 1fccd55036
2013-05-15 11:55:56 -05:00
Steve Harris
fddef92bf3 13.4.1-8 baseline
Former-commit-id: 02dba50c00 [formerly 576a74fe0b] [formerly 19866e7032] [formerly c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]]
Former-commit-id: c59b52a266
Former-commit-id: c60ffcebecebf9d637d3276980b24255a17f4079 [formerly a1c4cd2a39]
Former-commit-id: 5465764527
2013-05-14 09:21:41 -04:00
Richard Peter
2813a8fc47 Issue #1951: Integrate warning_ugczone into parent tables and add active table indexes.
Change-Id: Ie3e8b595cf67c6d30047d74e689b2cf9bcd31bea

Former-commit-id: 31a84fb91f [formerly c63a4882e7] [formerly 99391cfe12] [formerly d4135dba62 [formerly 99391cfe12 [formerly 883a51484d03900852ed84820aa559e088c97335]]]
Former-commit-id: d4135dba62
Former-commit-id: adfd41ab237c568aeecc21759b668b8afa0b7822 [formerly a02955e40c]
Former-commit-id: 43a90c062c
2013-05-13 17:16:57 -05:00
Richard Peter
b2b66da141 Merge branch 'master_13.4.1' (13.4.1-7) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFELockDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscSendJob.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/blocks/RedbookBlockBuilder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
	nativeLib/files.native/adapt/climate/bin/Linux/ASOS_smDecoder
	nativeLib/files.native/adapt/climate/bin/Linux/build_f6
	nativeLib/files.native/adapt/climate/bin/Linux/create_climate
	nativeLib/files.native/adapt/climate/bin/Linux/display_climate
	nativeLib/files.native/adapt/climate/bin/Linux/do_all_climate
	nativeLib/files.native/adapt/climate/bin/Linux/format_climate
	nativeLib/files.native/adapt/climate/bin/Linux/init_climate
	nativeLib/files.native/adapt/climate/bin/Linux/qc_climate
	nativeLib/files.native/adapt/climate/bin/Linux/recordClimate
	nativeLib/files.native/adapt/climate/bin/Linux/set_up_climate
	nativeLib/files.native/edex/lib/native/linux32/libXm.so
	nativeLib/files.native/edex/lib/native/linux32/libXm.so.2
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg.so.6
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so
	nativeLib/files.native/edex/lib/native/linux32/libecpg_compat.so.3
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so
	nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so
	nativeLib/files.native/edex/lib/native/linux32/libpgtypes.so.3
	nativeLib/files.native/edex/lib/native/linux32/libtcl.so
	nativeLib/files.native/edex/lib/native/linux32/libtk.so
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Change-Id: Idddce3fffab060f0eeaf69c3df825af0a6edd23e

Former-commit-id: b374309faf [formerly 4ae23b93d9] [formerly 8062c38b71] [formerly ba590e2f93 [formerly 8062c38b71 [formerly 4cd57d3ee7f55b3fdea60376d5dea57b1729fccc]]]
Former-commit-id: ba590e2f93
Former-commit-id: 845e355d3758a8223bad200d62847aef296e66cc [formerly 8e5929406c]
Former-commit-id: faf22cc925
2013-05-13 16:33:50 -05:00
Steve Harris
6e1e454a9f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]
Former-commit-id: ff7a21ac37
2013-05-13 12:58:10 -04:00
Ben Steffensmeier
c9c011aecc Issue #1993 Explicitly specify levels for CapeStk Derived parameter.
Former-commit-id: 1823c1850c [formerly 926da8983e] [formerly e5fc3f3835] [formerly 598ce2ae6c [formerly e5fc3f3835 [formerly 1d5f8f6514129ca7dc1ba2607c92d92cc2f60937]]]
Former-commit-id: 598ce2ae6c
Former-commit-id: f1b73d9e52924ffdea1445f4fde629bcef0cc742 [formerly b4c645f99f]
Former-commit-id: bb257fc9e5
2013-05-13 11:42:54 -05:00
Mike Duff
8fa2b8ce8c Issue #1919 - Fix VGBs in FFMP
Former-commit-id: 66f929fb14 [formerly d087b03eb3] [formerly f887a41875] [formerly 7874521269 [formerly f887a41875 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 130559fc1d4fb0be58387838e519191858bc2120 [formerly d262dc63f0]
Former-commit-id: 311ce09129
2013-05-10 09:58:02 -05:00
David Gillingham
f5c173cd59 Issue #1898: Ensure map bundles are copied to /site/bundles/maps/ not /site/maps/.
Change-Id: Iccd50915b7b19c49fe35fdfc7edd678e9fd7dac4

Former-commit-id: cb4a08c462 [formerly 11cb7b2295] [formerly 51063c7c53] [formerly 36944298f4 [formerly 51063c7c53 [formerly 4c7f1216d9e2ba683bc46adcfe1d5863e4477490]]]
Former-commit-id: 36944298f4
Former-commit-id: b588bb9f2302f7ea860ccec675a0926c0b479454 [formerly d475d8f07b]
Former-commit-id: c5983413a0
2013-05-09 14:28:17 -05:00
Brad Gonzales
d95850398b Issue #1970 added annotation comment to PluginDataObject header.
Change-Id: Ic6612278d98f862e0d1ba3d504a0391cf59f6a52

Former-commit-id: 1268c61a9d [formerly 36345cc166] [formerly 90d93e2a02] [formerly ed59927d62 [formerly 90d93e2a02 [formerly a84978566dda2f943dff31f61c30ee286d961fd1]]]
Former-commit-id: ed59927d62
Former-commit-id: e6289ff252c33afbb2dc87e5b8870b9c07b0db1e [formerly 877fbacffe]
Former-commit-id: 41fbf12b4d
2013-05-09 08:05:49 -05:00
Richard Peter
8917cc0b8d Issue #1814: Remove slow consumer disconnect. Add time to live to all topics
Change-Id: I5aeee431942e2b246e76035a18414a4b801deba7

Former-commit-id: c2dcbedf63 [formerly ae84ced7be] [formerly 4f3e86574b] [formerly 697297803c [formerly 4f3e86574b [formerly c46f5e242493d67f2bb89b2bbba7dcaf9b0f81f4]]]
Former-commit-id: 697297803c
Former-commit-id: c40599aa14bfde53120b5b8c8af969cd6cc57c9e [formerly cfaeeaff5f]
Former-commit-id: 139c234452
2013-05-08 17:28:01 -05:00
Ron Anderson
158dc49c6d Merge changes Id2d7981b,I094b88ed into omaha_13.4.1
* changes:
  Issue #1939: Update AlertVizApplication to start NotificationManagerJob
  Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories


Former-commit-id: 2afb5d56d5 [formerly 0bb6152a7b] [formerly 8a297d8e53] [formerly 65923ed892 [formerly 8a297d8e53 [formerly 1e94530814e28cc2a34cc92eab7164da3c3383e6]]]
Former-commit-id: 65923ed892
Former-commit-id: 2d2f67cad9cc5373df9e82190f0bb5b4ec1bf4c4 [formerly 532c740ce4]
Former-commit-id: 697c149281
2013-05-08 15:08:40 -05:00
Richard Peter
856824e025 Issue #1939: Update AlertVizApplication to start NotificationManagerJob
Change-Id: Id2d7981bf84befb771480126b4f250e80ee005a2

Former-commit-id: 289f73d1a4 [formerly 615a1182ea] [formerly f1f8260893] [formerly 785b402364 [formerly f1f8260893 [formerly 9f4d4de342b45ea54e328eec47fc606f1b087473]]]
Former-commit-id: 785b402364
Former-commit-id: c983d21a7d9365c0fb026918dc96f3e1f5d0face [formerly 4e878364c3]
Former-commit-id: 394018accf
2013-05-08 14:55:43 -05:00
Bryan Kowal
3a2154b47a Issue #1982 - prefix the qpid-java rpms with awips2.
Former-commit-id: a6d15fcb3c [formerly a55331f29f] [formerly bc39afbd24] [formerly 4513b65ad6 [formerly bc39afbd24 [formerly 89d10d50e5135e8b9f52a94ca1f4df53db7e4cf9]]]
Former-commit-id: 4513b65ad6
Former-commit-id: 03bfba28c50e2f18676d3107bbdc7bf11245386b [formerly 0c511e1d87]
Former-commit-id: ecac3f4403
2013-05-08 14:53:29 -05:00
Richard Peter
2de8bd116d Issue #1949: Fix Locks on D2D parms and setting of lastSentTime on histories
Change-Id: I094b88ed190287881c5f0e340c801571c2e38651

Former-commit-id: 94b56278e5 [formerly 96e2f1766c] [formerly ff60ca76f7] [formerly f59e4c9de9 [formerly ff60ca76f7 [formerly 0168cccd15ddb07988d946e3f4d719035dc63fb5]]]
Former-commit-id: f59e4c9de9
Former-commit-id: c61158a43637c1f37b2c2b4fd8ccad972e074ffe [formerly 30fc52f742]
Former-commit-id: 1174ffe848
2013-05-08 13:49:29 -05:00
Nate Jensen
879e4b54be Merge "Issue #1986 optimized table sorting" into omaha_13.4.1
Former-commit-id: 10025c2174 [formerly 2ab4ae9d16] [formerly 48d0829957] [formerly edcd6c851c [formerly 48d0829957 [formerly ed7005a317c7d5bca71370544d6f2f79e10e9dee]]]
Former-commit-id: edcd6c851c
Former-commit-id: c52eeb452de35110225827936c20673e78826505 [formerly c52c101f14]
Former-commit-id: 435ebdd199
2013-05-08 13:09:59 -05:00
Nate Jensen
c75b56f2b7 Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: e40d94e3b1 [formerly 7eb8725c69] [formerly bc1d029bd4] [formerly 8ad319d0f6 [formerly bc1d029bd4 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]]
Former-commit-id: 8ad319d0f6
Former-commit-id: 285de642f16eea6b4024d7669a6a65b9e5969b37 [formerly 1700be8b03]
Former-commit-id: 03d798817d
2013-05-08 13:09:17 -05:00
Nate Jensen
cc894cb894 Merge "Issue #1954 Revert HucLevelGeometriesFactory" into omaha_13.4.1
Former-commit-id: 4ba59ef95e [formerly 13201bdc1c] [formerly cdf07833b9] [formerly 02464ba2d5 [formerly cdf07833b9 [formerly 7bf591249ed0495be49813e77c6c5111c0c9b0b4]]]
Former-commit-id: 02464ba2d5
Former-commit-id: 08f0e00c2c54baf07503d6cfe7712d237ebdea67 [formerly 39c92d85ee]
Former-commit-id: caf05c1517
2013-05-08 13:03:50 -05:00
Nate Jensen
b44f864384 Merge "Issue #1847 Allow painting with no Wind Data. Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c" into omaha_13.4.1
Former-commit-id: 25c86dea79 [formerly ff7cf78d17] [formerly 653f4b2a0d] [formerly 744aaa14d6 [formerly 653f4b2a0d [formerly 129d546951798a7c839b420eb847baf1cebff2e2]]]
Former-commit-id: 744aaa14d6
Former-commit-id: 1fe3c867f713d718ffaf26f0ef56b8ce320661b4 [formerly 94f950734b]
Former-commit-id: 078efc3112
2013-05-08 13:02:59 -05:00
Ben Steffensmeier
b871b71dfa Issue #1847 Allow painting with no Wind Data.
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: c653b26b26 [formerly dcf4c3cb6e] [formerly 52845da6a8] [formerly 7b96ccbf0e [formerly 52845da6a8 [formerly c4eec589218d1c1265fd596646abd9dc2322fd74]]]
Former-commit-id: 7b96ccbf0e
Former-commit-id: 546c5fb066a2d3d0a153a33b16e7c62eb38a297e [formerly 5b151d48e2]
Former-commit-id: 5f1fcac916
2013-05-08 12:34:46 -05:00
Ron Anderson
086d8fc246 Merge "Issue #1988: Fix iscMosaic regression caused by DR 1941." into omaha_13.4.1
Former-commit-id: 345ac8a298 [formerly dd303701a1] [formerly 4e63cd7a70] [formerly 4b91905eaf [formerly 4e63cd7a70 [formerly 790a0c78c95414ddec13294b68905b1d7bbb60a9]]]
Former-commit-id: 4b91905eaf
Former-commit-id: ffafc2c173e962c618788f71949437d7c0a3a6dd [formerly 62c271f932]
Former-commit-id: 995acbba33
2013-05-08 12:21:28 -05:00
Ben Steffensmeier
aa20be04ce Issue #1954 Revert HucLevelGeometriesFactory
Former-commit-id: 85326d4eb5 [formerly b323f1f266] [formerly dbb6e1abbf] [formerly 6f0fadbfbf [formerly dbb6e1abbf [formerly 0be6bba1ac6db873c54f72bdb7e267bd6cc2ce5a]]]
Former-commit-id: 6f0fadbfbf
Former-commit-id: fa60784dabe08ae6cbe0ad79f9d2d30533bf806d [formerly 87775a876d]
Former-commit-id: 58668d66cb
2013-05-08 12:14:29 -05:00
Richard Peter
6fc9283ead Merge "Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager." into omaha_13.4.1
Former-commit-id: d2a407fe49 [formerly 05298c29be] [formerly 9b9c19c96f] [formerly 68a83a56e0 [formerly 9b9c19c96f [formerly 54afaa408fc663ed1d88883c843ce92ee41ac0cd]]]
Former-commit-id: 68a83a56e0
Former-commit-id: d9ef466247d4f97b763014797d95bf27dce90c21 [formerly a10753ebe7]
Former-commit-id: ccd08b2f59
2013-05-08 11:28:58 -05:00
David Gillingham
d913c3ae5f Issue #1988: Fix iscMosaic regression caused by DR 1941.
Change-Id: I6b2f28c6c1519645d3eedb081288e35545612ca9

Former-commit-id: 38b8a03b40 [formerly fb5996c663] [formerly 110c7d2571] [formerly 8140f0f00f [formerly 110c7d2571 [formerly d0ef15027759d301e16a4897b8ddc4a6670de2fb]]]
Former-commit-id: 8140f0f00f
Former-commit-id: b933b5dddd80ffc8560b2d0fb385708af784ef49 [formerly 2dee8ddb16]
Former-commit-id: ea79ddc331
2013-05-08 11:14:23 -05:00
Mike Duff
9381a96b69 Issue #1976 - Fix race condition in Hydro TS
Peer Review comments

Change-Id: I124176dcc242709f30f19152e7ecb6fda4e7c861

Former-commit-id: 9227336413 [formerly 62254c56ac] [formerly c27de86f3d] [formerly 00d96e88ac [formerly c27de86f3d [formerly 80c08a73c2bcaf853e63c175334b9f00dd93d696]]]
Former-commit-id: 00d96e88ac
Former-commit-id: 77ca32375486746930a9155481ba12efa3a3637c [formerly ae1e879aa4]
Former-commit-id: 9959645255
2013-05-07 13:17:33 -05:00
Steve Harris
5568ada76b 13.4.1-6 baseline
Former-commit-id: 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302]
Former-commit-id: 5be793f2f9
2013-05-07 08:47:39 -04:00
Brad Gonzales
dea192df4c Issue #1979 Fix Redbook frame issue parsing redbook data with a default header at the end of the buffer.
Change-Id: I30d89f84bbecf3250f491106b337c9c12ec88bb9

Former-commit-id: 86f2d468b9 [formerly d9b49b7a84] [formerly 13c449eb5d] [formerly b0f07f4a83 [formerly 13c449eb5d [formerly 90e1c8b65baad0af8f8a7a27b6b308b504c1be27]]]
Former-commit-id: b0f07f4a83
Former-commit-id: 28992925c8c8648b9da9176c6b84fbc3632a837b [formerly f3428938df]
Former-commit-id: 44f4a99def
2013-05-06 17:41:43 -05:00
Brad Gonzales
2d8831d74f Issue #1970 added check for Abstract Entity sql TABLE declarations in SchemaManager.
Amend: Removed second create index pattern in SchemaManager and added a contains check
       instead.  Added a StringUtil replace method.
       In StringUtil replace method, fixed increment of targetIndex before loop indexOf
       check.

Change-Id: Ic3538db7298e295470afad2b6cf63ea9bf0fc5fd

Former-commit-id: e8fed35773 [formerly 578ce7cfe3] [formerly e80649cadf] [formerly 355ee727be [formerly e80649cadf [formerly 1ed7ce737e6a8d42db2c70892fc2173b5000b44e]]]
Former-commit-id: 355ee727be
Former-commit-id: d668de0876fdb9fb24324881defb39453e10519d [formerly 6c32c5a21f]
Former-commit-id: a34eb2f7fb
2013-05-06 12:05:11 -05:00
Ben Steffensmeier
30b51f5d4d Issue #1930 Check for null in WatchesResource.
Former-commit-id: 71d03e3242 [formerly 3af6d471d8] [formerly 721db403ad] [formerly b8cb330cd1 [formerly 721db403ad [formerly 7feb01b219e5ace4cd7df115c20c6f4f64869126]]]
Former-commit-id: b8cb330cd1
Former-commit-id: 76d062751a86d3a0966108d311b2bbf0dcd56abb [formerly 150b116995]
Former-commit-id: e3b56ac975
2013-05-06 11:40:08 -05:00
Richard Peter
e4f3d60d90 Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: d11666193f [formerly 17a5f519cc] [formerly 39b90191a6e347610683f41fb7bca631ffab07d3 [formerly 083700d315]] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]
Former-commit-id: 2b496de6d8
Former-commit-id: a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7]
Former-commit-id: 398e808300
2013-05-05 14:25:36 -05:00
Steve Harris
450dbb7e8d 13.4.1-5 baseline
Former-commit-id: 313481c30e [formerly aa9a719836] [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: 2eb97f64bb7ce7cc6616c74badc76ecc130a4aee [formerly aa4624c58f]
Former-commit-id: e0af96524f
2013-05-03 09:29:14 -05:00
Richard Peter
9e6ee9fabb Issue #1814: Update Slow Consumer to have max depth of 100M
Change-Id: I53bd0260622d0fc79d16141b9d64ea2cb5b28310

Former-commit-id: f76d9b3365 [formerly 26ab9ac0d4] [formerly a3c86efdd1] [formerly 630eda8286 [formerly a3c86efdd1 [formerly fc038aa3edb9c017a926fc3124eb35966b55aa4f]]]
Former-commit-id: 630eda8286
Former-commit-id: f33bc71e69b91cdf85a94570aa8c37a17d6b8fa5 [formerly 917320fb4f]
Former-commit-id: f7e5d72cec
2013-05-03 09:25:48 -05:00
Steve Harris
f83b6daf56 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 29777b406e [formerly 344054d3e9] [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: 40a0e843311ddd470a12258a3bc95ce73d614c01 [formerly 99a7521fd6]
Former-commit-id: c1349f4a6d
2013-05-03 09:20:30 -05:00
Ben Steffensmeier
f69ad48314 Issue #1949 Update GFE data access in Product Browser, Volume Browser, and Data Access Framework.
Former-commit-id: 70a705e9c6 [formerly 09bbd5f2c9] [formerly 350ba7335fef29c49fb750f619f7b19a58916110 [formerly 926af755fe]] [formerly c1e14e69f7 [formerly 926af755fe [formerly 5539e83d56681d680ec92378b4dd408da2f94ae6]]]
Former-commit-id: c1e14e69f7
Former-commit-id: 0e364b102620d9e19bd9a3cc6d7ece856a6124e0 [formerly 1e127c732e]
Former-commit-id: 21f61522d7
2013-05-02 15:55:25 -05:00
Brad Gonzales
2c286cbca9 Issue #1970 Fixes for Hibernate dataURI and indsertTime Index generation.
Amend: Removed Inheritance strategy from GridRecord.
       Removed dataURI_idx from PluginDataObject.

Change-Id: If04f5388b339ffaafde1693917cf90a8512a1225

Former-commit-id: 5683873c24 [formerly 51a22d0146] [formerly b0bc5fc2c5] [formerly 89464e243e [formerly b0bc5fc2c5 [formerly 82722bc34cb49b8934063ab6ebdcf66a9bcbe024]]]
Former-commit-id: 89464e243e
Former-commit-id: ab43aea7d7d22f7038a896d00f2afeda839cbd74 [formerly 96332b9e63]
Former-commit-id: b9ba987cbe
2013-05-02 15:28:10 -05:00
Richard Peter
342a3dfb90 Merge "Issue #1949 Switch Product Browser from uengine to DbQueryRequest." into omaha_13.4.1
Former-commit-id: a8e994d400 [formerly 4f732a8b7c] [formerly f26d10f005] [formerly 12ec9ad6fe [formerly f26d10f005 [formerly 121f65c92214d50fc2c5da0151ee3e42455bc934]]]
Former-commit-id: 12ec9ad6fe
Former-commit-id: 4d537abd9d971595532949fd6b325373a6cac5d3 [formerly 1c93eab7d2]
Former-commit-id: 4ea3a25b15
2013-05-02 15:12:04 -05:00
Ben Steffensmeier
dade51c488 Issue #1949 Force ModelSounding in Vb to play nicely with others.
Former-commit-id: 62519247e8 [formerly f6357d8ed5] [formerly 3342990f2f] [formerly f3e7ff0d0b [formerly 3342990f2f [formerly 5e2b6a200aca6d9bbd1b00b9d61f1b8e723547ab]]]
Former-commit-id: f3e7ff0d0b
Former-commit-id: e0e28481864e73c9fe8314e6e422ec9e47f86936 [formerly cf73134a4e]
Former-commit-id: 2af97cfee3
2013-05-02 14:19:04 -05:00
Ben Steffensmeier
6486961b02 Issue #1949 Switch Product Browser from uengine to DbQueryRequest.
Former-commit-id: 4d2bee0f16 [formerly 615565d75c] [formerly 0982076772] [formerly bd8a292e90 [formerly 0982076772 [formerly 9b78ecbaf0d54d95c4cc94d2a11a36c250f48a32]]]
Former-commit-id: bd8a292e90
Former-commit-id: 33b5e15e28d06a2fe53b8ee1fb13209cdd41bf76 [formerly 3038d6abd1]
Former-commit-id: 0458726fd1
2013-05-02 14:15:23 -05:00
Steve Harris
7d085660f8 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]
Former-commit-id: 4357e2dacc
2013-05-02 10:00:38 -05:00
Richard Peter
f843e49163 Issue #1949: Fix build
Change-Id: I52ede4bfe94a88331989dfb8320b0dfdeedae71d

Former-commit-id: 4089b9779e [formerly 8569c11beb] [formerly 9dd975fddaaec55f0b858cd22a8ce2b6e8c53005 [formerly 092c0364de]] [formerly 378dc1677c [formerly 092c0364de [formerly cf8ccf45ed32c50a84dd59de42f6e87b83ff6a21]]]
Former-commit-id: 378dc1677c
Former-commit-id: 7205dbaf390bba61db2e667ab401956e30655096 [formerly e9092e8447]
Former-commit-id: 167b43e4ca
2013-05-02 09:06:44 -05:00
Ron Anderson
2719bd15c9 Merge "Issue #1949: Normalize the GFE Database, incorporate peer review comments, add upgrade script. Updated GFE DataURI to individual fields to fix D2D autoUpdate." into omaha_13.4.1
Former-commit-id: 75bf7ca965 [formerly 0647a3f5b1] [formerly d443cbd61f] [formerly cf1be8bdc4 [formerly d443cbd61f [formerly 043f3d6c60817e8f0d38a304a4b36d18caf01399]]]
Former-commit-id: cf1be8bdc4
Former-commit-id: ace032b8ec952734f068c094d105bc05dfb1bae6 [formerly 888cd022ab]
Former-commit-id: fd3fedf1d8
2013-05-01 17:26:26 -05:00