Commit graph

3276 commits

Author SHA1 Message Date
Nate Jensen
fc905ca588 Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
Former-commit-id: c8f486ed32dfffff69ff9e9fefe1320c4ec009f4
2014-06-12 15:14:50 -05:00
Brian Clements
91eb7d40c2 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
df2fed2be3 Omaha #3263 Check for null when mosaic time matches.
Former-commit-id: 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9
2014-06-12 15:00:26 -05:00
Nate Jensen
d3417d8e45 Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
Former-commit-id: 6e2588a672ceb81a922be9fcdac9a4212376ed5f
2014-06-12 14:27:47 -05:00
Ben Steffensmeier
35ad2f2b8d Omaha #2061 Remove dataURI from acars.
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
2014-06-12 13:59:45 -05:00
Nate Jensen
305564d6f0 Omaha #3270 fix warngen manifest's register buddy
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2

Former-commit-id: 796e242b031087e08b9ba5e44664d6b400405c42
2014-06-12 13:58:27 -05:00
Nate Jensen
f118e1b0e9 Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
Former-commit-id: 88280dedea4b6065a5603ac26e982eab0a2e0e72
2014-06-12 12:36:14 -05:00
Richard Peter
7731e25983 Merge "Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200)." into omaha_14.4.1
Former-commit-id: 3285557835e929a6b7048f4445d1da45ae8e1325
2014-06-12 12:35:24 -05:00
Nate Jensen
95fe41966a Omaha #3247 upgrade build.cave's xalan jar
Change-Id: Idd4e0d583ef4ad91bcde99278e3e035f1f12e434

Former-commit-id: c2d32dddb2bba04b46099d8745ff541989e1a281
2014-06-12 11:38:22 -05:00
Slav Korolev
16ec392c12 Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 0172e8f27b646a965e472f969f112a4e170d9f41
2014-06-12 12:24:34 -04:00
Mike Duff
c920a24300 Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 47d57692c81757a8b8c0d3217e21f701f18cdf2c
2014-06-12 11:21:15 -05:00
Roger Ferrel
42fe1bf5b2 Omaha #3252 Fix bug in __makeHader to prevent unexpected exception.
Former-commit-id: 787261f13c47b5de81b2e7c4f861645614a11f1f
2014-06-12 10:08:51 -05:00
Ben Steffensmeier
c70462fb8a Omaha #3217 Add always prompt option to thinclient connectivity dialog.
Former-commit-id: aac3fdd00b429932d9cfa5d950f9729ace54a933
2014-06-11 17:00:16 -05:00
Nate Jensen
4354bac2d5 Merge "Omaha #3266 remove unused attributes and elements from baseline menu xml files" into omaha_14.4.1
Former-commit-id: b97df26a25976d58409dad8e43b1ca3ce7471133
2014-06-11 13:09:34 -05:00
Ben Steffensmeier
30415ae8c5 Omaha #2061 Remove IDecoderGettable from all AWIPS2 Raytheon PDOs.
Former-commit-id: b6c63e5791a2438253d6ff039b5164c61105a941
2014-06-11 12:38:35 -05:00
Nate Jensen
955e115c00 Omaha #3266 remove unused attributes and elements from baseline menu xml
files

Change-Id: I1a1f75f2b2a314679487ddf719f4f0055bdf8d01

Former-commit-id: 797504a970ec39c4fd56c9e0d51b292acfceea1b
2014-06-10 18:30:14 -05:00
Nate Jensen
10207907d8 Merge "Omaha #2061 Delete PlotResource, rename PlotResource2." into omaha_14.4.1
Former-commit-id: b0903898a40916383f88b920e87dfc072d9cafa9
2014-06-10 17:14:53 -05:00
Ben Steffensmeier
cad15768cc Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: d0a3a73a3a2375a49dc3e224a1c13956530d3351
2014-06-10 16:34:44 -05:00
Ben Steffensmeier
a98872cb89 Omaha #2061 Delete PlotResource, rename PlotResource2.
Former-commit-id: b569c7c3e175ed1519576aea63048c3f675d3875
2014-06-10 15:59:15 -05:00
Nate Jensen
19bef8d080 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1
Former-commit-id: ffa3e069c0beb5678ecb863b2950556d8c289ae1
2014-06-09 09:38:50 -05:00
Brian Clements
f39896b2d1 Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: e2583481a77d08249030838ebd52eed6e54b2986
2014-06-06 14:39:57 -05:00
Nate Jensen
920e53628b Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1
Former-commit-id: 22a5da1feff7e30ea0408f089305d95657befad2
2014-06-05 17:38:32 -05:00
Ben Steffensmeier
26325b57be Omaha #3232 Radar code improvements.
Former-commit-id: 696f45d67c5e5b02183f97cfcc139db017f01848
2014-06-05 14:53:25 -05:00
Roger Ferrel
10e7a33f08 Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data.
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: 3e976b7ed5cf46687bbb76073e53f35ffc2c2812
2014-06-04 08:14:06 -05:00
Ben Steffensmeier
310e6562e6 Omaha #3163 Fix collaboration string differencing
Former-commit-id: e6f30c822de26bafae339a8871c4ba98100e6d1a
2014-06-03 13:51:46 -05:00
Ron Anderson
304364e356 Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages.
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37
2014-06-02 17:14:18 -05:00
Nate Jensen
a862846e15 Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1
Former-commit-id: 4abb30354ef4f6c6520ee993a66371656db0db9f
2014-06-02 12:44:17 -05:00
Steve Harris
455eb8b39d Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 45250149681f057cf168f4d3cb27276279f62c05
2014-06-02 11:21:46 -05:00
Ben Steffensmeier
b078baf67d Omaha #2918 Synchronize mosaic dataTimes.
Former-commit-id: c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383
2014-06-02 10:41:45 -05:00
Steve Harris
3bde6b3e41 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: ee696cb24c8d72f0562126a131824e958b88f090
2014-06-02 07:31:14 -05:00
Ron Anderson
22d67fcad1 Omaha #2841 Fix errors when formatters fail to queue due to pending limit.
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d

Former-commit-id: b15cb1632b58c415399ccc8dee6cf2c13140355f
2014-05-30 10:47:28 -05:00
Brian.Dyke
3f1e12effc Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
2014-05-30 10:46:25 -04:00
Ron Anderson
7df866b471 Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1
Former-commit-id: e13f80b81df762d6658cce9ad534dc499791ba46
2014-05-29 18:50:52 -05:00
Ron Anderson
8e1f4331da Omaha #2841 Separate queuing of text formatters and product scripts.
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8

Former-commit-id: 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a
2014-05-29 16:55:02 -05:00
Richard Peter
e2288769d3 Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: b48d9bd6affc340ef4791c99cbc95f122c4a69f8
2014-05-29 15:50:59 -05:00
Steve Harris
5bc251beaa Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

Former-commit-id: c944b3b98f68b8f65b853fb244002e3382dc38a2
2014-05-29 13:42:09 -05:00
Roger Ferrel
825e2c1b19 Omaha #3171 Change Archive Retention labels.
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085

Former-commit-id: 1249deb91b6463044a59ca564e26f82612f52d40
2014-05-29 12:33:15 -05:00
Nate Jensen
8cc13d8334 Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1
Former-commit-id: db3ff4b3bf81cbea49169369be01ce5c919157fd
2014-05-28 12:43:12 -05:00
Ron Anderson
8b5daad4db Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1
Former-commit-id: 3869a36a6cad1674e8ec493d03937c21ddde7f21
2014-05-28 11:59:51 -05:00
Nate Jensen
e7dc89cddd Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1
Former-commit-id: 55cf25f0671f17e667f7c785f3580a93267f8790
2014-05-28 10:28:49 -05:00
Ron Anderson
b7271025f9 Omaha #3110 Permanent fix for mutable database creation.
Former-commit-id: a0001c9ed3d414237069f43a29dd907111c16832
2014-05-28 10:09:12 -05:00
Steve Harris
dc74953978 Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: 802843fa475654ffab03545a4970f4e5857590cd
2014-05-28 09:01:00 -05:00
Steve Harris
048d3748b7 Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java

Former-commit-id: 70398b6d6c43e8931d4d88660af2ba7a8b2668e2
2014-05-28 07:41:42 -05:00
Nate Jensen
67ac5fa242 Omaha #3133 Removed dead hydro code and related dependencies
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 13d3dc45edab66106e9aa5a1149ca05e94d144c3
2014-05-27 18:23:38 -05:00
Steve Harris
3b16bbafb1 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: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
Slav Korolev
81033087ea Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
Former-commit-id: 14ff7a84235ed8cc95aca488910e7f975a5bd41e
2014-05-27 12:24:50 -04:00
Brian Clements
2fd2b5aa16 Omaha #3206 added version to servlet api in cave feature
without this, the build prefers the javax.servlet in the target platform

Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80

Former-commit-id: d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2
2014-05-23 17:04:49 -05:00
Nate Jensen
b67bf1e492 Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
Former-commit-id: 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d
2014-05-22 16:46:50 -05:00
Steve Harris
b6af2db9f5 Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
Brian Clements
c875f17719 Omaha #3206 edex changes related to new javax.serlvet FOSS project
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00