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

3526 commits

Author SHA1 Message Date
Ben Steffensmeier
f60667703f Omaha #3263 Synchronize dataTimes of storm track resources. 
Former-commit-id: eff1921f70 [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]
Former-commit-id: cad15768cc
Former-commit-id: b02383f878
 2014-06-10 16:34:44 -05:00
Ben Steffensmeier
6a5b6dcf8e Omaha #2061 Delete PlotResource, rename PlotResource2. 
Former-commit-id: 1e37d669d8 [formerly 1e37d669d8 [formerly b569c7c3e175ed1519576aea63048c3f675d3875]]
Former-commit-id: a98872cb89
Former-commit-id: d40c6fd625
 2014-06-10 15:59:15 -05:00
Brian.Dyke
a4b39dfca5 Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: f72380ad60 [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 49cd9574d9
 2014-06-10 13:56:03 -04:00
Brian.Dyke
81d732477e CM-MERGE:OB13.5.6-1,-2 into 14.1.3 
Former-commit-id: c1b3f9d180 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: 8874d41872
Former-commit-id: f568b5606a
 2014-06-10 12:52:59 -04:00
Nate Jensen
17e3c5f898 Merge "Omaha #3226 added total lightning decoder" into omaha_14.4.1 
Former-commit-id: c8b6324240 [formerly c8b6324240 [formerly ffa3e069c0beb5678ecb863b2950556d8c289ae1]]
Former-commit-id: 19bef8d080
Former-commit-id: 1d619bcf95
 2014-06-09 09:38:50 -05:00
Mike Duff
4b9f707a06 ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing. 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 81ab64d7ff [formerly 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]]
Former-commit-id: 39173c380c
Former-commit-id: b880d171d4
 2014-06-06 16:03:14 -04:00
Brian Clements
ca1b869647 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: c278000764 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]
Former-commit-id: f39896b2d1
Former-commit-id: b98a3494fe
 2014-06-06 14:39:57 -05:00
Nate Jensen
24f7247805 Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1 
Former-commit-id: 3b324093ae [formerly 3b324093ae [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]
Former-commit-id: 920e53628b
Former-commit-id: c0f047b24f
 2014-06-05 17:38:32 -05:00
Ben Steffensmeier
9e97750df2 Omaha #3232 Radar code improvements. 
Former-commit-id: 8587b9b43b [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]
Former-commit-id: 26325b57be
Former-commit-id: b8fe181c9a
 2014-06-05 14:53:25 -05:00
Michael Gamazaychikov
29e197404f ASM #114 - Problem with Distance Speed Tool. 
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75

Former-commit-id: c07bcacbf8 [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: 50ab77046b
Former-commit-id: 5efb82ea3e
 2014-06-05 13:43:04 +01:00
Roger Ferrel
050c2e87e7 Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data. 
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: e1c011b157 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]
Former-commit-id: 10e7a33f08
Former-commit-id: aa085d9e59
 2014-06-04 08:14:06 -05:00
Brian.Dyke
75c6886f61 Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 61b206be0b [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 244467210c
 2014-06-04 07:46:16 -04:00
Kenneth Sperow
3e94502542 Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml

Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8

Former-commit-id: c302ef8967 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: f2a738cc25
Former-commit-id: ca913b6159
 2014-06-03 20:55:29 -07:00
brian.dyke
21721fd935 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 79f866fb17 [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]
Former-commit-id: b3d95ca18d
Former-commit-id: 76cbdf64ff
 2014-06-03 16:14:16 -04:00
Ben Steffensmeier
b40e97f5ac Omaha #3163 Fix collaboration string differencing 
Former-commit-id: ca2210b3e7 [formerly ca2210b3e7 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]
Former-commit-id: 310e6562e6
Former-commit-id: 72f1d7c950
 2014-06-03 13:51:46 -05:00
Zhidong.Hao
3a9abec04b ASM #106 - AvnFPS Monitor TAF valid time display different from A1 
Change-Id: Iddf3f4ee46b94f28494dc15764b91f38c0176325

Former-commit-id: 26c6801620 [formerly 26c6801620 [formerly 74597b2630ffd8d984b193f72126a9a5d0b3a942]]
Former-commit-id: 71ab6b9ed0
Former-commit-id: e5c47a51eb
 2014-06-03 11:55:32 -04:00
Ron Anderson
7171bc6f0a Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages. 
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: 3f169399b8 [formerly 3f169399b8 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]
Former-commit-id: 304364e356
Former-commit-id: 3ff441f9da
 2014-06-02 17:14:18 -05:00
Nate Jensen
ba546c3001 Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1 
Former-commit-id: d94a040f29 [formerly d94a040f29 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]
Former-commit-id: a862846e15
Former-commit-id: 1f4daca6e3
 2014-06-02 12:44:17 -05:00
Steve Harris
cbceb4ea62 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: 7fec0d039c [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 455eb8b39d
Former-commit-id: ec743199f1
 2014-06-02 11:21:46 -05:00
Ben Steffensmeier
cbe8c64e73 Omaha #2918 Synchronize mosaic dataTimes. 
Former-commit-id: 8a117864d8 [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]
Former-commit-id: b078baf67d
Former-commit-id: b4e1a98e23
 2014-06-02 10:41:45 -05:00
Steve Harris
46b7122d56 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1 
Former-commit-id: 65a3390a6a [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 3bde6b3e41
Former-commit-id: c3deafc840
 2014-06-02 07:31:14 -05:00
Brian.Dyke
45deec5df6 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: b8ba378862 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]
Former-commit-id: c6244e1950
Former-commit-id: 6edbd149a5
 2014-06-02 07:01:37 -04:00
Ron Anderson
ecaa8ab0a9 Omaha #2841 Fix errors when formatters fail to queue due to pending limit. 
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d

Former-commit-id: 1108744b40 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]
Former-commit-id: 22d67fcad1
Former-commit-id: 33abe4a8d3
 2014-05-30 10:47:28 -05:00
Brian.Dyke
a23d371522 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: a8737e18f0 [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: 3f1e12effc
Former-commit-id: 66aacd6578
 2014-05-30 10:46:25 -04:00
brian.dyke
3f9ac5ba24 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 95c5dc49c1 [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: e09bd1d283
 2014-05-30 10:09:00 -04:00
Ron Anderson
30495f52db Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1 
Former-commit-id: 8309a5656a [formerly 8309a5656a [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]
Former-commit-id: 7df866b471
Former-commit-id: ff31990a13
 2014-05-29 18:50:52 -05:00
Ron Anderson
114532dd8d Omaha #2841 Separate queuing of text formatters and product scripts. 
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8

Former-commit-id: a9f3b486f3 [formerly a9f3b486f3 [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]
Former-commit-id: 8e1f4331da
Former-commit-id: f765c74e5e
 2014-05-29 16:55:02 -05:00
Richard Peter
8ba13f812e Omaha #3223 - Remove DD dependencies from AWIPS2_baseline 
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: 558699a370 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]
Former-commit-id: e2288769d3
Former-commit-id: 220f7aa97a
 2014-05-29 15:50:59 -05:00
Steve Harris
77e18c2e9a Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository 
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

Former-commit-id: 79d5592fdf [formerly 79d5592fdf [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]
Former-commit-id: 5bc251beaa
Former-commit-id: c830097b13
 2014-05-29 13:42:09 -05:00
Roger Ferrel
6c78b5e04c Omaha #3171 Change Archive Retention labels. 
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085

Former-commit-id: 44a23b4500 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]
Former-commit-id: 825e2c1b19
Former-commit-id: 15545c5239
 2014-05-29 12:33:15 -05:00
Nate Jensen
fda484c9ff Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1 
Former-commit-id: 3e174fe39c [formerly 3e174fe39c [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]
Former-commit-id: 8cc13d8334
Former-commit-id: a921570418
 2014-05-28 12:43:12 -05:00
Ron Anderson
81c044d476 Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1 
Former-commit-id: da0a173698 [formerly da0a173698 [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]
Former-commit-id: 8b5daad4db
Former-commit-id: 191283e96d
 2014-05-28 11:59:51 -05:00
Nate Jensen
e4df449f49 Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1 
Former-commit-id: 905fa8f283 [formerly 905fa8f283 [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]
Former-commit-id: e7dc89cddd
Former-commit-id: 05b1401849
 2014-05-28 10:28:49 -05:00
Ron Anderson
b6b463682f Omaha #3110 Permanent fix for mutable database creation. 
Former-commit-id: 4633de4ea3 [formerly 4633de4ea3 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]
Former-commit-id: b7271025f9
Former-commit-id: f2733999de
 2014-05-28 10:09:12 -05:00
Steve Harris
6412cc1427 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: be80bd01f3 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: dc74953978
Former-commit-id: 713cfeffc7
 2014-05-28 09:01:00 -05:00
Steve Harris
95462b4f80 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: 2c49d14c12 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 048d3748b7
Former-commit-id: 4ed44b6e72
 2014-05-28 07:41:42 -05:00
Nate Jensen
11899e65e2 Omaha #3133 Removed dead hydro code and related dependencies 
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 514c9d3a0c [formerly 514c9d3a0c [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]
Former-commit-id: 67ac5fa242
Former-commit-id: c2f78a6888
 2014-05-27 18:23:38 -05:00
Steve Harris
144354c369 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: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
 2014-05-27 14:48:24 -04:00
Slav Korolev
ced313a7f1 Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager. 
Former-commit-id: e3fe3c9736 [formerly e3fe3c9736 [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]
Former-commit-id: 81033087ea
Former-commit-id: 4a8e7fc38e
 2014-05-27 12:24:50 -04:00
Brian Clements
e88d9a2e8c 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: 6f76a9a328 [formerly 6f76a9a328 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: af8a6806f0
 2014-05-23 17:04:49 -05:00
Nate Jensen
dcfd7a07eb Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1 
Former-commit-id: 8f6dcfaa1b [formerly 8f6dcfaa1b [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]
Former-commit-id: b67bf1e492
Former-commit-id: 935086d60e
 2014-05-22 16:46:50 -05:00
Kenneth Sperow
51b0b4e566 Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 189e3cc1f2 [formerly 189e3cc1f2 [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: 8490f7ea33 [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]
Former-commit-id: 9fa9425aea
Former-commit-id: 846395fd42
 2014-05-22 14:16:49 -07:00
Steve Harris
d226dfb021 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: 518822ed83 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]
Former-commit-id: b6af2db9f5
Former-commit-id: 14b1ea307f
 2014-05-22 14:31:06 -05:00
Brian Clements
e7730e2219 Omaha #3206 edex changes related to new javax.serlvet FOSS project 
Former-commit-id: f9de79465a [formerly f9de79465a [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]
Former-commit-id: c875f17719
Former-commit-id: fd9f98b2ba
 2014-05-22 14:09:07 -05:00
Steve Harris
e7e48b2abb Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1 
Former-commit-id: 4899c4f56a [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 0df4af413b
 2014-05-22 14:05:06 -05:00
brian.dyke
40660547cf Merge branch 'master_14.2.2' into asm_14.2.2 
Former-commit-id: 562f53874a [formerly 562f53874a [formerly 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6]]
Former-commit-id: f74b1707f9
Former-commit-id: 69a4d1e3b9
 2014-05-22 12:46:56 -04:00
Ron Anderson
0d54a37b6c Issue #3194 Fix GeoTIFF import 
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a

Former-commit-id: 52931af5ce [formerly 52931af5ce [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]
Former-commit-id: 2a680b73ea
Former-commit-id: b7338080e2
 2014-05-22 09:53:47 -05:00
Matthew Howard
eb700ea256 Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1 
Former-commit-id: 95b9746871 [formerly 95b9746871 [formerly 5893d06b990cec295338595b006a45bb762b4b73]]
Former-commit-id: e17f8a0082
Former-commit-id: 725fff1b13
 2014-05-22 07:50:50 -05:00
Michael Gamazaychikov
55d44735ef ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes). 
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85

Former-commit-id: 63409ef272 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: 134f486069
 2014-05-21 15:12:08 +01:00
Zhidong.Hao
17a525443c ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button 
Change-Id: I764436168339ce46ab01b27c9078455e6a543176

Former-commit-id: bcdb0dba95 [formerly bcdb0dba95 [formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]
Former-commit-id: 77ac5458d0
Former-commit-id: a65061a58f
 2014-05-21 09:15:41 -04:00