24 commits

Author	SHA1	Message	Date
Steve Harris	08308cd279	Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.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 cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66 Former-commit-id: 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]] Former-commit-id: 99bc6f990c Former-commit-id: 3de24b7b07	2014-05-27 14:48:24 -04:00
Shawn.Hooper	5f03948ff5	ASM #577 - Removed com.raytheon.viz.dataaccess.feature plugin from p2-build.xml ... Change-Id: I505a9cc943b7ab09b430ca826efa1ee81f08a930 Former-commit-id: b4597dc021 [formerly a3e52e8cea [formerly 968a136e81b6247a03af9b78643c388d21a4218b]] Former-commit-id: a3e52e8cea Former-commit-id: 9182d8428a	2014-04-25 10:40:43 -04:00
Bryan Kowal	0e89136215	Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change) ... Former-commit-id: 678fb83ded [formerly 6fd129379f [formerly e027cf42b3b395a834f91512e269e41377f673ef]] Former-commit-id: 6fd129379f Former-commit-id: 6e19ac4acf	2014-01-30 18:11:48 -06:00
Bryan Kowal	54d0d4fd55	Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency ... Former-commit-id: ee95e4de7e [formerly d88019d902 [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]] Former-commit-id: d88019d902 Former-commit-id: 635548dae3	2014-01-29 14:25:38 -06:00
Max Schenkelberg	a3495d01dc	Issue #2620 Reordered developer feature.xml to match p2-build.xml ... Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67 Former-commit-id: 73c022da20 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]] Former-commit-id: ae7eb39380 Former-commit-id: 13172879fd	2014-01-10 10:39:07 -06:00
Bryan Kowal	ab100bb5b1	Revert "Issue #2033 - pde and rpm build updates" ... Undo copying localization into etc at build time. This reverts commit b344543d81 [formerly 33a9270304] [formerly 6023c61bca] [formerly 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]]]. Former-commit-id: 9d47e7565d [formerly bb2e914c00 [formerly f735b7bb3a0e23389be086d3582a2e0afdc95515]] Former-commit-id: bb2e914c00 Former-commit-id: a75ed2b079	2013-10-04 09:47:59 -05:00
Bryan Kowal	b344543d81	Issue #2033 - pde and rpm build updates ... Former-commit-id: 9a77e3553a [formerly 6023c61bca [formerly dbdb2fc2b0bb6e2354a089fab0ffcaa924c398a1]] Former-commit-id: 6023c61bca Former-commit-id: 33a9270304	2013-09-20 12:36:56 -05:00
Ben Steffensmeier	4eefcf0f6e	Issue #2262 Delete meteolib. ... Former-commit-id: 0961408d40 [formerly ffa79b8992 [formerly 125546e4da877fbb732b9fa40c68b08bc764f8e0]] Former-commit-id: ffa79b8992 Former-commit-id: f236cc79a2	2013-08-28 14:53:46 -05:00
Bryan Kowal	d162a2d4fb	Issue #2164 - correct feature build order based on addition of new feature; declare avnfps dependency on new feature ... Former-commit-id: c042734b88 [formerly c0dc06d6be [formerly 19c49ef06500f4d2e588a0a7b3889da2dddd30a4]] Former-commit-id: c0dc06d6be Former-commit-id: 06fc7d50d9	2013-08-20 19:22:07 -05:00
Ben Steffensmeier	98b53fc247	Issue #2269 add new acarssounding feature to resolve dependency issues. ... Former-commit-id: b2989eb937 [formerly b51bd9bf9e [formerly eb6b98e80f483f330022481889522dcfd7f0e526]] Former-commit-id: b51bd9bf9e Former-commit-id: a271dd3416	2013-08-20 14:41:57 -05:00
Max Schenkelberg	9be1171c33	Issue #2033 moved bundles and menu files into corresponding plugins ... Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc Former-commit-id: 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]] Former-commit-id: 5ab8b6e2c6 Former-commit-id: 6c92aa9dd7	2013-08-14 09:20:28 -05:00
Max Schenkelberg	7d88c2a719	Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source. ... Amend: Fixed println, added uncustomization of displays to interface, fixed font issue Amend: Fixed comments and switched to TimeUtil for common constants for time Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525 Former-commit-id: f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]] Former-commit-id: 474429aaee Former-commit-id: 54fe14b06b	2013-08-05 16:46:02 -05:00
Bryan Kowal	970eaad447	Issue #2164 - fix 13.6.1 build ... Change-Id: I9f4e29f8f19abf7700baad125617054c8a561ff3 Former-commit-id: 1c49dff18e [formerly c2b54d7c31 [formerly ea1628be6840c42fffd2e8b8437386a4df3aacca]] Former-commit-id: c2b54d7c31 Former-commit-id: 34efd01a4f	2013-07-03 11:25:46 -05:00
Brad Gonzales	aca1486801	Issue #1965 Added null check for topLevelDirs in purgeExpiredFromArchive. ... Amend: Added archive feature to the viz product build. Added archive feature to the viz developer product. Change-Id: I49a9e2245236a81e72d66b08cf9af251cadd1f07 Former-commit-id: f4bb78381c [formerly c28d1e5d4d [formerly a1f31ee98b485e501f677e03c4e1bc521b3e8b4e]] Former-commit-id: c28d1e5d4d Former-commit-id: 65507d4424	2013-06-27 17:40:07 -05:00
Steve Harris	5d99df9969	13.5.1-1 baseline ... Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]] Former-commit-id: 998961612c Former-commit-id: 6384018950	2013-06-10 15:17:17 -04:00
Steve Harris	79567aac51	13.4.1-1 baseline ... Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]] Former-commit-id: 2f517b7713 Former-commit-id: f95e0ad10b	2013-04-24 17:15:55 -05:00
Steve Harris	6f374b35d0	13.3.1-12 baseline ... Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]] Former-commit-id: 0be473728a Former-commit-id: be96282207	2013-03-25 13:27:13 -05:00
Steve Harris	a4fa438a41	13.2.1-2 baseline ... Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]] Former-commit-id: 83e9157df7 Former-commit-id: 33bc5fd816	2013-01-23 11:18:44 -05:00
Steve Harris	e8f4a2f031	13.1.2-2 baseline ... Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]] Former-commit-id: c0c1d56f3a Former-commit-id: 51208e5515	2013-01-06 14:32:24 -06:00
Steve Harris	6e44abdba1	12.11.1-4 baseline ... Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]] Former-commit-id: d3497e47eb Former-commit-id: 98171b5de9	2012-10-16 13:27:07 -05:00
Steve Harris	0403e7d0a9	12.10.1-3 baseline ... Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]] Former-commit-id: 21f430062b Former-commit-id: de1639aea2	2012-09-11 16:00:38 -05:00
Steve Harris	71b024e3a1	12.9.1-4 baseline ... Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]] Former-commit-id: dcda3a2290 Former-commit-id: 36c108e960	2012-08-15 15:19:10 -05:00
Steve Harris	2f10c7a1e4	12.5.1-15 baseline ... Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]] Former-commit-id: b13cbb7e00 Former-commit-id: 8552902906	2012-06-08 13:39:48 -05:00
root	133dc97f67	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 9f19e3f712 Former-commit-id: a02aeb236c	2012-01-06 08:55:05 -06:00