xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33182 commits 31 branches 40 tags 3.8 GiB
Commit graph

115 commits

Author SHA1 Message Date
mjames-upc
2e3f856355 UKMET-Global replacing UKMET-NorthernHemisphere 
Former-commit-id: 8f4fc1001f
 2016-03-09 14:18:05 -07:00
mjames-upc
c8b157eb46 grid naming updates 
Former-commit-id: ee4d47a486
 2016-03-09 12:26:50 -07:00
mjames-upc
bf687306d0 RequiredExecutionEnvironment: JavaSE-1.7 
Former-commit-id: 5b6bc2ace8
 2016-02-03 21:45:47 -06:00
mjames-upc
9558ef4789 vb updates, new bundles, names 
Former-commit-id: c7cf0a2d41
 2016-01-17 20:58:01 -06:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
mjames-upc
246f895137 purge rules for MRMS grids 
Former-commit-id: c54fb14442
Former-commit-id: c490d3cd9f
 2015-09-11 15:38:19 -06:00
mjames-upc
5c2df8ee81 renaming NAM 12km due to GFE processing errors 
Former-commit-id: 11106b5bc8d2ec05bfb90a7511acc09c78248376 [formerly 094e8547b7a46796fb147b2b5a25109a04da9a2b] [formerly 2cea9dfa88 [formerly d2e2e5b460]]
Former-commit-id: 2cea9dfa88
Former-commit-id: b75dd9ba0a
 2015-08-24 15:27:31 -06:00
AWIPS User
7dcd274419 menu changes and grid names 
Former-commit-id: 91c4c62031 [formerly 81a569898b] [formerly 7b419a2fd1] [formerly 9149863d10b6ddbbf64451edcfd5c79837399851 [formerly b089ea25f508301e99397abae541aa51d123b414] [formerly 7b419a2fd1 [formerly aac1cde7c4]]]
Former-commit-id: b6704fea6502d22b7c2e4ba5624374f5000a401c [formerly c459b2db09cb44a4b26b81fbbc44eb4643968192] [formerly 375ca58d7d [formerly 6daec9740c]]
Former-commit-id: 375ca58d7d
Former-commit-id: af740c8da3
 2015-07-22 17:24:11 -06:00
AWIPS User
b244f74ae3 more grid purge rules 
Former-commit-id: af77f307b7 [formerly 74c6827c65] [formerly c90c707f9a] [formerly 3529b5d1c90f70ff31bbd7b73b471ba97b819837 [formerly 416b7e324351f004502d470e43a3f1ea1326c5f2] [formerly c90c707f9a [formerly 47f54bcec5]]]
Former-commit-id: 825230c1a724ef10123d83d2ce9b483502c8b807 [formerly 61b1bdb9216631a9a0bde8e7b0685a539d0a94dd] [formerly f12ddf6f61 [formerly daa9b372b3]]
Former-commit-id: 881e1bd62434892c5146bd8e15403ac6640de34f [formerly f12ddf6f61]
Former-commit-id: f61fa92f7f
 2015-07-12 08:20:59 -06:00
AWIPS User
7d1fef5d59 more grid purge rules 
Former-commit-id: fdd2a10fe0 [formerly 1e0e99bb0e] [formerly 234f52de32] [formerly 3d161c1adcda72945b70afad48d416c325d83cce [formerly bf2e570eb55fb69818635e1370eaf235895af672] [formerly 234f52de32 [formerly ca6f19f09c]]]
Former-commit-id: ab6b079824a0822c259409ff92b163696bee2b22 [formerly 3e0738c2289f04d38578a57057b9c800013c60ea] [formerly 524712e195 [formerly 7f7dcd1e06]]
Former-commit-id: 524712e195
Former-commit-id: 7ce4c4b8ab
 2015-07-12 08:20:17 -06:00
AWIPS User
a235f9012b grid and satellite purge rule updates 
Former-commit-id: a5722c6ccb [formerly c15691fca8] [formerly fe14c9d907] [formerly ebb721c69b2d19552332390f7cad48b0d4e8644c [formerly 9845ff47f7af0032cb4ea75ad73f480b745727c5] [formerly fe14c9d907 [formerly f020086ec3]]]
Former-commit-id: 1c5f9fddea8a19bd37f512a53015725dab335e1a [formerly 2ea065b12f4cea15730c550f08f1a0d211f68033] [formerly 1349e3d850 [formerly be6658a8d3]]
Former-commit-id: 1349e3d850
Former-commit-id: 14ae0ddde1
 2015-07-11 12:06:57 -06:00
Fay.Liang
9d752cfc41 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 7349df3d27 [formerly 9742125df2b54fe54e1e06dba554de21db52f5a0]
Former-commit-id: b0d72bf798
 2015-04-08 12:22:27 -04:00
Fay.Liang
020a0fbe3a Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: a204a6210e [formerly 5e481a056337b7f502921886725382258c6e29d1]
Former-commit-id: 8ce086e41a
 2015-04-01 13:04:48 -04:00
Fay.Liang
8f8f86f60c Merge tag 'OB_14.4.1-20m' into master_15.1.1 
14.4.1-20m

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 133a603566 [formerly 1d282a64da2998d91040a7c97f2e81beea0a8da4]
Former-commit-id: 3bd4d76143
 2015-03-30 14:28:30 -04:00
Steve Harris
de00ba4b57 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1 
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7375074ed8 [formerly 7cad81591e22bc1a46f54982f0cd0ca647208290]
Former-commit-id: 1aab7b1831
 2015-03-30 11:07:52 -05:00
Melissa Porricel
152bdd241d ASM #16905 - Implement missing RTMA/URMA parameters 
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527

Former-commit-id: 9a2a726fb9 [formerly d68078b665787d91bfd92440345d41f9fcc98b3d]
Former-commit-id: d96bbe4799
 2015-03-26 09:58:45 -04:00
Fay.Liang
6796af2399 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: 86a8041062 [formerly ba576b948587ea7b1c077ebad7113bc4e7504c00]
Former-commit-id: 2eb8777058
 2015-03-19 12:35:31 -04:00
Steve Harris
31a6aa8107 Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 67b3a77c4f [formerly 41217304fa68101d17e003b2fa6992d0e15b083c]
Former-commit-id: 2fd5ba420f
 2015-03-18 09:29:01 -05:00
Melissa Porricel
f24e8de19e ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km 
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c

Former-commit-id: fcdcb81963 [formerly 9c7d466213eaac3a46fddf416967d00e3446bfee]
Former-commit-id: 7db813d59c
 2015-03-16 17:14:56 -04:00
Nate Jensen
3f10021049 Omaha #4234 initialize the main python interpreter on a different thread 
than the sub-interpreters, or warn when that happens

Change-Id: Id4d2c2401c96f6d884e5c468419f2d5893f6eafd

Former-commit-id: e1536e8a6e [formerly 5386e7fabcfbac366bb5335f601bcd0719b4f32c]
Former-commit-id: 7318d0e603
 2015-03-10 15:41:32 -05:00
Tiffany Meyer
19f2e097ce VLab Issue #6834 - MRMS Sub-gridding velocity patch; fixes #6834 
Former-commit-id: df86b25aa9 [formerly 639a67e0ff96c5ea23613a75071017ecf86085c8]
Former-commit-id: 62b8b3a30c
 2015-03-10 09:42:14 -05:00
Steve Harris
da982be8b7 Merge tag 'OB_14.4.1-6m' into omaha_15.1.1 
14.4.1-6

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: afb3d31759 [formerly 9fd5ed1aea1a667552144da88dcc394a99133c52]
Former-commit-id: 8cd98ea3b9
 2015-02-03 12:25:05 -06:00
David Gillingham
a6b2a5cabf Omaha #4014: Add ingest and display support for ETSS model. 
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846

Former-commit-id: 4604975854 [formerly fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7]
Former-commit-id: 41af2f661c
 2015-01-20 14:02:06 -06:00
Joshua Watson
8058051e2e VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238 
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: d86ee989aa [formerly cf1882cc44] [formerly 0c375981e7] [formerly 0c375981e7 [formerly 3f2f7f2f3a]] [formerly d86ee989aa [formerly cf1882cc44] [formerly 0c375981e7] [formerly 0c375981e7 [formerly 3f2f7f2f3a]] [formerly 5aa4748569 [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]]]
Former-commit-id: 5aa4748569
Former-commit-id: 673866a139 [formerly e419cebdea] [formerly 1040be8594] [formerly a6b40dbc1ec10756fa3ff415c2fba56ad9f864b7 [formerly acf20dd93b57335f5216ef543b921227c78af2eb] [formerly 1040be8594 [formerly 094e8048e9]]]
Former-commit-id: 366e3e206465f6674a4e4bffb8dd8fef12f47135 [formerly 7dccfd850e0304ac1124ea5b96ef03ed520b2f03] [formerly 8dd62191ae [formerly eb68dac32d]]
Former-commit-id: 8dd62191ae
Former-commit-id: ef7dbe8735
 2014-12-17 08:38:27 -05:00
Joshua Watson
0c375981e7 VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238 
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]
Former-commit-id: 3f2f7f2f3a
 2014-12-17 08:38:27 -05:00
Joshua Watson
0f8e1b0278 VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: 85d67b46ce [formerly 0d02d676b4] [formerly 0c8b629c96] [formerly 0c8b629c96 [formerly a8f5bb480b]] [formerly 85d67b46ce [formerly 0d02d676b4] [formerly 0c8b629c96] [formerly 0c8b629c96 [formerly a8f5bb480b]] [formerly bca4b40eed [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]]]
Former-commit-id: bca4b40eed
Former-commit-id: 83bd8b8b23 [formerly 1c99832ab2] [formerly ce1476d78f] [formerly ae90f314107c3ecc35a67708c407f9d1c65164f5 [formerly ddff465e08a2a953e3178779f582e8f0d1f8ea23] [formerly ce1476d78f [formerly 9383635749]]]
Former-commit-id: 95444fc3749b73eae8a61b29a64ad32ac137ba73 [formerly 2a340305564d3a45aecb6fbfe0c24d468ebd50cc] [formerly 8789ca8e8e [formerly 33e4b8bc88]]
Former-commit-id: 8789ca8e8e
Former-commit-id: b423dc7745
 2014-12-11 11:39:00 -05:00
Joshua Watson
0c8b629c96 VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]
Former-commit-id: a8f5bb480b
 2014-12-11 11:39:00 -05:00
Benjamin Phillippe
37baae1c0e Omaha #3454 Upgrading to Hibernate 4.2.15 
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: 81a16aa4de [formerly af4f8e1c8a] [formerly e6deeb6fb5] [formerly e6deeb6fb5 [formerly 7845e8e40f]] [formerly 81a16aa4de [formerly af4f8e1c8a] [formerly e6deeb6fb5] [formerly e6deeb6fb5 [formerly 7845e8e40f]] [formerly fdd16051e8 [formerly e6deeb6fb5 [formerly 7845e8e40f] [formerly fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]]]]]
Former-commit-id: fdd16051e8
Former-commit-id: 657886f0be [formerly c77edf49f8] [formerly a8ef477042] [formerly 71284821d1f5dc6a417253b3fb722ec85ada2e7b [formerly d7e89f87bfd941634f6cb4c75072b070108267c4] [formerly a8ef477042 [formerly 5eec33b078]]]
Former-commit-id: 4c8009a4d7aa5a098251ae0929f9c78046a40238 [formerly 62bf8f62e268a6361913c3567879ca0d71e2b3ef] [formerly 008b23be1e [formerly 3808c125b9]]
Former-commit-id: 008b23be1e
Former-commit-id: b4acac2eaa
 2014-10-20 12:42:19 -05:00
Benjamin Phillippe
e6deeb6fb5 Omaha #3454 Upgrading to Hibernate 4.2.15 
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29

Former-commit-id: fdd16051e8 [formerly 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5]
Former-commit-id: 7845e8e40f
 2014-10-20 12:42:19 -05:00
Steve Harris
3f7b7cb843 Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: 772969f5c8 [formerly 53dc9657e2] [formerly 06a27b2d3c] [formerly 06a27b2d3c [formerly 39c5e9c314]] [formerly 772969f5c8 [formerly 53dc9657e2] [formerly 06a27b2d3c] [formerly 06a27b2d3c [formerly 39c5e9c314]] [formerly 2db03d95b3 [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]]]
Former-commit-id: 2db03d95b3
Former-commit-id: 3a167feb92 [formerly ca63a8cfc3] [formerly bcf1265a16] [formerly 6590c91604916f7b96535d8ffe4438afc15e8f9d [formerly 4363db305e76ae3a50e019f510a7b919ebc7230e] [formerly bcf1265a16 [formerly 3542caf090]]]
Former-commit-id: 02f62561b7e901eb7e411cfc7ab2c4301fea5f2b [formerly 0522d4db8f9331e9bfd83cc7147290634159c673] [formerly afd3d3fa2d [formerly cfd49c8ca0]]
Former-commit-id: afd3d3fa2d
Former-commit-id: cf73096716
 2014-10-06 13:57:59 -05:00
Steve Harris
06a27b2d3c Merge tag 'OB_14.3.1-24m' into omaha_14.4.1 
Former-commit-id: 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]
Former-commit-id: 39c5e9c314
 2014-10-06 13:57:59 -05:00
Brian.Dyke
374b669bfc Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: ff12e5c05c [formerly 06f6dfc38a] [formerly 006bdb00ad] [formerly 006bdb00ad [formerly 65ad6056b6]] [formerly ff12e5c05c [formerly 06f6dfc38a] [formerly 006bdb00ad] [formerly 006bdb00ad [formerly 65ad6056b6]] [formerly f3f95aabb0 [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]]]
Former-commit-id: f3f95aabb0
Former-commit-id: 787dd72934 [formerly 452a3f046b] [formerly d174db3b0c] [formerly 8078d005ea853597b3b19b8c5cd6c287e6b87bbf [formerly c24910662181554debcd898acc9cf5ec28027cf0] [formerly d174db3b0c [formerly e77f1e126e]]]
Former-commit-id: 4e6e8024c2b58243a90fd754468adccfd3cdfb78 [formerly 2c9750edd9ade43fd7db7e61b4503a53d6f26781] [formerly e100894074 [formerly 1d2dfd264a]]
Former-commit-id: e100894074
Former-commit-id: 2b3ced91f5
 2014-10-02 10:38:51 -04:00
Brian.Dyke
006bdb00ad Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]
Former-commit-id: 65ad6056b6
 2014-10-02 10:38:51 -04:00
Darrel Kingfield
129dfdf5b3 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603 
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 2c89019c25 [formerly 48387a6bcf] [formerly 3eeaa8f359] [formerly 3eeaa8f359 [formerly 1cabae50b1]] [formerly 2c89019c25 [formerly 48387a6bcf] [formerly 3eeaa8f359] [formerly 3eeaa8f359 [formerly 1cabae50b1]] [formerly 88a8dddef3 [formerly 3eeaa8f359 [formerly 1cabae50b1] [formerly 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]]]]]
Former-commit-id: 88a8dddef3
Former-commit-id: ec14432ca1 [formerly 3fc3c878ce] [formerly b5e546503c] [formerly b3bc5e67ced7b2cff1826dbfa9dd5fa91bece2d0 [formerly 84f67f72b73c8e8a6bab68a5c1c18d696b14b730] [formerly b5e546503c [formerly 00a056c154]]]
Former-commit-id: eeb23f9a975c9fcb035647bcc524a41a7cb99893 [formerly be0abf007625df1407024754c3cb657219086d15] [formerly 11fd795d32 [formerly 142edfe588]]
Former-commit-id: 11fd795d32
Former-commit-id: bb517865e2
 2014-09-19 11:14:09 -05:00
Darrel Kingfield
3eeaa8f359 VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603 
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872

Former-commit-id: 88a8dddef3 [formerly a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a]
Former-commit-id: 1cabae50b1
 2014-09-19 11:14:09 -05:00
Steve Harris
5169f11c70 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: cf2e045de3 [formerly e3a7796362] [formerly da530db540] [formerly da530db540 [formerly 091555cf10]] [formerly cf2e045de3 [formerly e3a7796362] [formerly da530db540] [formerly da530db540 [formerly 091555cf10]] [formerly 4c56844e29 [formerly da530db540 [formerly 091555cf10] [formerly 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]]]]
Former-commit-id: 4c56844e29
Former-commit-id: e3127a1d3c [formerly a1bf8ecdb1] [formerly 84a98ec4ca] [formerly 6a5333aeb239eb379e054282c3776a23e3f91fe7 [formerly 275a024694cc566f868a949d844ab91490e424f6] [formerly 84a98ec4ca [formerly 214b48dcb8]]]
Former-commit-id: 14860c498982e4d1f8e090ef58738fc8574c11ef [formerly 9adb015794435a13e656ce09cd891bfd9e4d53db] [formerly f4ea796cea [formerly fdc523a026]]
Former-commit-id: f4ea796cea
Former-commit-id: b316e73f24
 2014-09-19 10:28:57 -05:00
Steve Harris
da530db540 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]
Former-commit-id: 091555cf10
 2014-09-19 10:28:57 -05:00
Nate Jensen
eb895b2fa4 Omaha #3356 fix ingestGrib level factory initialization order 
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: 0f7d1da1e9 [formerly 85951c3aff] [formerly 877aab446c] [formerly 877aab446c [formerly b516c4b8c8]] [formerly 0f7d1da1e9 [formerly 85951c3aff] [formerly 877aab446c] [formerly 877aab446c [formerly b516c4b8c8]] [formerly b89781c419 [formerly 877aab446c [formerly b516c4b8c8] [formerly b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]]]]]
Former-commit-id: b89781c419
Former-commit-id: ac7da05cc6 [formerly 8be2eed541] [formerly 5d7897e9bc] [formerly b8543bfc490271d9fbab480050a9109a50da00d5 [formerly 23dd78b2611da0c58f39ffed2d491a487063803a] [formerly 5d7897e9bc [formerly 57851af7d6]]]
Former-commit-id: ad611964e05dcc9ec61244f056bd2879832392c2 [formerly e076ec73db31c9b92c1ec0446652f600678ac239] [formerly 89ea61abb0 [formerly 1370795313]]
Former-commit-id: 95f9f017c656b45130e9461df6110489cf3a5e63 [formerly 89ea61abb0]
Former-commit-id: 55512ac35c
 2014-09-16 13:24:46 -05:00
Nate Jensen
877aab446c Omaha #3356 fix ingestGrib level factory initialization order 
Change-Id: Iaad6d7aa9999f8387ed32806c655e5dee7e6a985

Former-commit-id: b89781c419 [formerly 0ed8b10495a08f1f120cfb3ed4e99e011e3db5a2]
Former-commit-id: b516c4b8c8
 2014-09-16 13:24:46 -05:00
Nate Jensen
429ef264f3 Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: bc06641202 [formerly 1e06c862bf] [formerly 1c77f66608] [formerly 1c77f66608 [formerly ae9cffaaea]] [formerly bc06641202 [formerly 1e06c862bf] [formerly 1c77f66608] [formerly 1c77f66608 [formerly ae9cffaaea]] [formerly 62b84b2fb3 [formerly 1c77f66608 [formerly ae9cffaaea] [formerly 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]]]]]
Former-commit-id: 62b84b2fb3
Former-commit-id: 51d16716fe [formerly 925288784b] [formerly d397d4147c] [formerly c828dd57fc62319c2b02bdfff0031fce4e313fc2 [formerly 87f7aeab8ea0381f4b60524400099467d56eef15] [formerly d397d4147c [formerly f5ae895143]]]
Former-commit-id: 374840bbe3eae6286da961ea24460aa1794ffee5 [formerly 14cf3a3aaa85b3c7504b40d5dab981a05190edd4] [formerly 3cf27fb414 [formerly eec3df9cd5]]
Former-commit-id: 3cf27fb414
Former-commit-id: 5bf7a632ad
 2014-09-09 15:38:53 -05:00
Nate Jensen
1c77f66608 Omaha #3356 updates for improved level lookup 
Change-Id: I32ca44114fb18770bff22c6d0c9173e8fa49a362

Former-commit-id: 62b84b2fb3 [formerly 0ca90b58d7ca85d5bfc8fc525415115ac8451c5b]
Former-commit-id: ae9cffaaea
 2014-09-09 15:38:53 -05:00
Ana Rivera
e800adeff8 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154 
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 193928c9b4 [formerly 53b72f2fd8] [formerly 9670521c07] [formerly 9670521c07 [formerly c10b50d0b2]] [formerly 193928c9b4 [formerly 53b72f2fd8] [formerly 9670521c07] [formerly 9670521c07 [formerly c10b50d0b2]] [formerly 088ebd2ca2 [formerly 9670521c07 [formerly c10b50d0b2] [formerly 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]]]]]
Former-commit-id: 088ebd2ca2
Former-commit-id: 92bed60f57 [formerly aaaaeedef9] [formerly 5a764dff66] [formerly 484aefd23c977f7ff677b1ffae9e4629d4967083 [formerly ad7e3ffa1b2fc1c7437851259989b79129848438] [formerly 5a764dff66 [formerly 752bc11851]]]
Former-commit-id: 7152eafa4ffbc4ceddb6c306e1ea1422ca4e9944 [formerly ef2e493f9412fcf09cbbc3350571fb84dcf7d786] [formerly 462749040d [formerly 0eb194e2bb]]
Former-commit-id: 849c059411e02ee87b074dc192eeb181b84a4d36 [formerly 462749040d]
Former-commit-id: 1323571625
 2014-07-21 21:41:17 +00:00
Ana Rivera
9670521c07 VLab Issue #4154 - DR_14068, DCS_53 Add 3 RTMA parms, add AK RTMA 3km; closes #4154 
Change-Id: If6af5c54b31911a954295ce4ae60c9d9449d4b55

Former-commit-id: 088ebd2ca2 [formerly 9c3460d34513dd2f54643b87cb8afd122d94ea9c]
Former-commit-id: c10b50d0b2
 2014-07-21 21:41:17 +00:00
Steve Harris
91c48437cf Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 97843cf58e [formerly 9213369739]] [formerly eece76ad05 [formerly 4d724b6474] [formerly 97843cf58e] [formerly 97843cf58e [formerly 9213369739]] [formerly e1c8ad2611 [formerly 97843cf58e [formerly 9213369739] [formerly e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]]]]]
Former-commit-id: e1c8ad2611
Former-commit-id: 6450c3d6ee [formerly 6cc0c35e76] [formerly d7cd0ac02c] [formerly 1503533d05a69d55df5729868ed86e74147fcedd [formerly 9dc77519d1d40439f9609aa1b8bb1f64c8a1ab8a] [formerly d7cd0ac02c [formerly 362988b9d7]]]
Former-commit-id: c8a2475f45349c68f72a6762c674110a72c5f92a [formerly 54590884305d436b0bff6e041169417a3fab2fbb] [formerly a0d17947a9 [formerly 8270fd8a9f]]
Former-commit-id: 7fa45b27701395fd238cf8765786122a21b0f209 [formerly a0d17947a9]
Former-commit-id: 563cf7b455
 2014-06-16 08:19:12 -05:00
Steve Harris
97843cf58e Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: e1c8ad2611 [formerly 48a7eabebb78db9b97201c44ff5c71af3ee78de7]
Former-commit-id: 9213369739
 2014-06-16 08:19:12 -05:00
Nate Jensen
f6c317d641 Omaha #3211 fix edex startup issues 
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c

Former-commit-id: 80d4d00e78 [formerly ee0dba554e] [formerly 6e85b66b1b] [formerly 6e85b66b1b [formerly f973ce1bbe]] [formerly 80d4d00e78 [formerly ee0dba554e] [formerly 6e85b66b1b] [formerly 6e85b66b1b [formerly f973ce1bbe]] [formerly cf5a1d16c9 [formerly 6e85b66b1b [formerly f973ce1bbe] [formerly cf5a1d16c9 [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]]]]]
Former-commit-id: cf5a1d16c9
Former-commit-id: c6f8ff48da [formerly fbc82ec5bc] [formerly 4cf6224645] [formerly 5bb5271e1c61b3621c18b3af5559cabedce86cb1 [formerly 796a60bc7c13a51245e9460f4371830224dff47c] [formerly 4cf6224645 [formerly 25ec0697ae]]]
Former-commit-id: 868784b4d924c2c180994c57a28270a43703f865 [formerly 1405007afd16b75876dcfb17bd68e897fc59e30a] [formerly 3f9512f549 [formerly 25d09c4183]]
Former-commit-id: 3f9512f549
Former-commit-id: 064dd363f0
 2014-06-02 12:39:34 -05:00
Nate Jensen
6e85b66b1b Omaha #3211 fix edex startup issues 
Change-Id: I634ec432e7136e191706d4b8b7063d845dd9fb7c

Former-commit-id: cf5a1d16c9 [formerly dd5cabbc335662e0583b76a5bef6bfdf28569735]
Former-commit-id: f973ce1bbe
 2014-06-02 12:39:34 -05:00
Brian Clements
632bab22dc Omaha #3179 split modes.xml into plugin modes files 
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: f4f2e0ca96 [formerly d0f3a81ef3] [formerly 2baee319de] [formerly 2baee319de [formerly 5e39a68498]] [formerly f4f2e0ca96 [formerly d0f3a81ef3] [formerly 2baee319de] [formerly 2baee319de [formerly 5e39a68498]] [formerly 334bb53dea [formerly 2baee319de [formerly 5e39a68498] [formerly 334bb53dea [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]]]]
Former-commit-id: 334bb53dea
Former-commit-id: 66427e476e [formerly aa9cdfcbda] [formerly f2db2d8fef] [formerly 2d6ab5f65d17e0f3a440bb81ec2bcd6bc113aa6a [formerly 0d6427587ecc90b7e50f550274863c6cf30a2287] [formerly f2db2d8fef [formerly d79c63a429]]]
Former-commit-id: 0ccefaec0116cc8366bfd6bfef6a8ddf920dd43b [formerly 2dcfe24a3a97bac16325762fd9e13124da8b1f16] [formerly 902e576373 [formerly 2dcbd33a4e]]
Former-commit-id: 902e576373
Former-commit-id: 519fb42a15
 2014-05-28 13:32:18 -05:00
Brian Clements
2baee319de Omaha #3179 split modes.xml into plugin modes files 
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: 334bb53dea [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]
Former-commit-id: 5e39a68498
 2014-05-28 13:32:18 -05:00
Kenneth Sperow
13d62603d4 Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 661d109eab [formerly 30173aa114] [formerly 476c78a2d7] [formerly 476c78a2d7 [formerly 189e3cc1f2]] [formerly 661d109eab [formerly 30173aa114] [formerly 476c78a2d7] [formerly 476c78a2d7 [formerly 189e3cc1f2]] [formerly 342398e6a3 [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]]]] 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f

Former-commit-id: 606e3dfa9d [formerly 5e3a370777] [formerly 6f8b069dbe] [formerly 6f8b069dbe [formerly 8490f7ea33]] [formerly 606e3dfa9d [formerly 5e3a370777] [formerly 6f8b069dbe] [formerly 6f8b069dbe [formerly 8490f7ea33]] [formerly 9fa9425aea [formerly 6f8b069dbe [formerly 8490f7ea33] [formerly 9fa9425aea [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]]]]
Former-commit-id: 9fa9425aea
Former-commit-id: 2a00387eeb [formerly 186b8987ed] [formerly 7302462544] [formerly 0d91384d390c2bebafb77fe5ad9bdf764650884c [formerly 32e40a5886b016193ab4c39a18d36a93d1143fdb] [formerly 7302462544 [formerly 846395fd42]]]
Former-commit-id: e017bdb02384f85900a20d43bb2ab958a3bf190f [formerly bd2d790b3e0fdcecb8c3759c0035a981ed6db7b1] [formerly 386365e3cb [formerly 51b0b4e566]]
Former-commit-id: cf50fcaf3cc3779a6679ff6b6080895bf3e5c173 [formerly 386365e3cb]
Former-commit-id: 1b837bed5d
 2014-05-22 14:16:49 -07:00