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

5923 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Harris
2b95865dec 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: 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]
Former-commit-id: 7fec0d039c
Former-commit-id: 647cd97e29
 2014-06-02 11:21:46 -05:00
Steve Harris
be2931c623 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1 
Former-commit-id: 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 65a3390a6a
Former-commit-id: 4e26e224fd
 2014-06-02 07:31:14 -05:00
Ron Anderson
217e4e7ba5 Omaha #2841 Fix errors when formatters fail to queue due to pending limit. 
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d

Former-commit-id: 22d67fcad1 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]
Former-commit-id: 1108744b40
Former-commit-id: 916e607254
 2014-05-30 10:47:28 -05:00
Brian.Dyke
5524d6b38d 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: 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: a8737e18f0
Former-commit-id: a0a879be7d
 2014-05-30 10:46:25 -04:00
Ron Anderson
3a27c2fe6e Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1 
Former-commit-id: 7df866b471 [formerly 8309a5656a [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]
Former-commit-id: 8309a5656a
Former-commit-id: 27a9790684
 2014-05-29 18:50:52 -05:00
Ron Anderson
2dec43f246 Omaha #2841 Separate queuing of text formatters and product scripts. 
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8

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

Former-commit-id: e2288769d3 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]
Former-commit-id: 558699a370
Former-commit-id: 3beef299b1
 2014-05-29 15:50:59 -05:00
Nate Jensen
9ccfc0efa1 Omaha #3211 changes to support improved authentication/authorization 
Change-Id: If793dcbe3bed741f1b75ce338b152eb69d845172

Former-commit-id: 1e362625e5 [formerly 4fdb6df9a1 [formerly c4eeb1730778f7f18aa4d74587ebcddb3932c6e6]]
Former-commit-id: 4fdb6df9a1
Former-commit-id: e4029da3dc
 2014-05-29 15:28:53 -05:00
Richard Peter
f0ba15fba3 Merge "Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository" into omaha_14.4.1 
Former-commit-id: 1c04a15ec7 [formerly 9cd8710876 [formerly df4e87624ad0bc6db759677435e7c276f500d3da]]
Former-commit-id: 9cd8710876
Former-commit-id: 82bf2b9e94
 2014-05-29 14:13:54 -05:00
Richard Peter
3d7e4bc0ba Merge "Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository" into omaha_14.4.1 
Former-commit-id: 0c8e7e05bd [formerly fca34641a0 [formerly 933f04911ad40e66f49da96c872306f4e89a2eca]]
Former-commit-id: fca34641a0
Former-commit-id: af040cffa8
 2014-05-29 14:01:22 -05:00
Nate Jensen
9fa1b78e76 Merge "Omaha #2536 merge autobldsrv into text plugins" into omaha_14.4.1 
Former-commit-id: c43a2bf217 [formerly 5cfbcb7e98 [formerly 5f72fc0a65a1b3b64298a2aacaa18ab84c8df93e]]
Former-commit-id: 5cfbcb7e98
Former-commit-id: a709601e2f
 2014-05-29 13:51:09 -05:00
Steve Harris
c4811405d5 Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository 
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

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

Former-commit-id: 825e2c1b19 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]
Former-commit-id: 44a23b4500
Former-commit-id: eebc5096b2
 2014-05-29 12:33:15 -05:00
Steve Harris
be5b5215f5 Omaha #3210 - moving foss from cots/ into AWIPS2_foss repository 
Former-commit-id: 9396273e49 [formerly 24de47720f [formerly 762b2ad4da3ab2944b0df17ce655bcc60d02bdc3]]
Former-commit-id: 24de47720f
Former-commit-id: 119df754b6
 2014-05-29 12:00:50 -05:00
Brian Clements
d1a4845e01 Omaha #3179 moved ebxml ecludes from datadelivery to registry modes 
Change-Id: Id95a5b7ca307a52a2ae271becfc73c4fccef12de

Former-commit-id: 5abe7ea99d [formerly fb71fae2d1 [formerly f3baedf6187a70e9c98d73b6819fa46e9c00c702]]
Former-commit-id: fb71fae2d1
Former-commit-id: 32cf8deb3a
 2014-05-29 11:58:10 -05:00
Brian Clements
7c364fa77c Omaha #3179 added modes directory to custom targets 
Change-Id: I43587e7d33cddd8dcd4b8056c90cc88bd78df1fe

Former-commit-id: 77276d6efb [formerly a1da843e2a [formerly 3d324c5b62a1f960099a5515cbd7c588ce7c5d7f]]
Former-commit-id: a1da843e2a
Former-commit-id: 04cba3e10e
 2014-05-29 09:08:53 -05:00
Brian Clements
de85e00fde Omaha #2536 merge autobldsrv into text plugins 
Change-Id: I4a149b9f16dcc868274bca7e2f4de3d4dad78e52

Former-commit-id: 542d36f107 [formerly 5d0eaf02ab [formerly 5ae9b617dfeb4ff809916706ac1e849f762bd5a2]]
Former-commit-id: 5d0eaf02ab
Former-commit-id: 4aade4bf2e
 2014-05-29 08:19:47 -05:00
Ben Steffensmeier
8b460b713d Omaha #2990 Fix radar mesocyclone regex. 
Former-commit-id: cd6ba70787 [formerly c7c6c1b7ec [formerly 8e03f08f2d01f8b47101c09f950a0830cf8f0bb6]]
Former-commit-id: c7c6c1b7ec
Former-commit-id: 5404dd5f83
 2014-05-28 16:40:35 -05:00
Nate Jensen
7902d8ca0b Merge "Omaha #3179 split modes.xml into plugin modes files" into omaha_14.4.1 
Former-commit-id: 6beda0c45b [formerly 942aa72b01 [formerly eec07fb20d6566b1e1d361ef971e50e5a019fcbf]]
Former-commit-id: 942aa72b01
Former-commit-id: a27988ec2c
 2014-05-28 13:42:07 -05:00
Brian Clements
d0f3a81ef3 Omaha #3179 split modes.xml into plugin modes files 
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a

Former-commit-id: 334bb53dea [formerly 5e39a68498 [formerly e626f47c9bb8900af2f4734513b2c94b83f082c8]]
Former-commit-id: 5e39a68498
Former-commit-id: 2baee319de
 2014-05-28 13:32:18 -05:00
Nate Jensen
ecc95c47da Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1 
Former-commit-id: 8cc13d8334 [formerly 3e174fe39c [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]
Former-commit-id: 3e174fe39c
Former-commit-id: 6fc643af39
 2014-05-28 12:43:12 -05:00
Brian Clements
edb365530e Omaha #3152 modified rcm build to deploy logback instead of log4j 
Change-Id: I829bea003053d5f2b0cf17234fc26a8ff35334ac

Former-commit-id: 190e877633 [formerly c227a54da0 [formerly d9c3f3845e51f5892c80ec6e4b8ed6efc2769d0e]]
Former-commit-id: c227a54da0
Former-commit-id: 3b2acfc091
 2014-05-28 12:17:39 -05:00
Ron Anderson
8f56396ad7 Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1 
Former-commit-id: 8b5daad4db [formerly da0a173698 [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]
Former-commit-id: da0a173698
Former-commit-id: 8b580a891d
 2014-05-28 11:59:51 -05:00
Richard Peter
857d694371 Merge "Omaha #3137 - Add checks to prevent NullPointerException." into omaha_14.4.1 
Former-commit-id: 6a01bcd3b0 [formerly daaaed85d5 [formerly 93ab5e949da1f654ea15a2044b587125f3243ebc]]
Former-commit-id: daaaed85d5
Former-commit-id: 37ae3d341c
 2014-05-28 11:07:41 -05:00
Nate Jensen
e53ec8ab82 Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1 
Former-commit-id: e7dc89cddd [formerly 905fa8f283 [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]
Former-commit-id: 905fa8f283
Former-commit-id: 719c53a044
 2014-05-28 10:28:49 -05:00
Ron Anderson
aabc6e4fa4 Omaha #3110 Permanent fix for mutable database creation. 
Former-commit-id: b7271025f9 [formerly 4633de4ea3 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]
Former-commit-id: 4633de4ea3
Former-commit-id: 17da90e8db
 2014-05-28 10:09:12 -05:00
Roger Ferrel
8753350174 Omaha #3137 - Add checks to prevent NullPointerException. 
Former-commit-id: b235e56e28 [formerly 3331d58e1c [formerly 42dcb85d536485f3ae244e69a315e88169d04c97]]
Former-commit-id: 3331d58e1c
Former-commit-id: d901d99bde
 2014-05-28 09:54:37 -05:00
Steve Harris
58dab4c8ad Omaha #3132 - new TPCSurgeProb files should have gone to core in the merge 
Former-commit-id: 66e157489e [formerly 63020bd766 [formerly 80da354c8bacab21dc0675f280989c2d8e15acd4]]
Former-commit-id: 63020bd766
Former-commit-id: b87e3463e7
 2014-05-28 09:32:43 -05:00
Steve Harris
4469d87a8f 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: dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]
Former-commit-id: be80bd01f3
Former-commit-id: 718c78d984
 2014-05-28 09:01:00 -05:00
Steve Harris
835486c63f 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: 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 2c49d14c12
Former-commit-id: a4825f4b27
 2014-05-28 07:41:42 -05:00
Nate Jensen
424c3c1334 Omaha #3133 Removed dead hydro code and related dependencies 
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 67ac5fa242 [formerly 514c9d3a0c [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]
Former-commit-id: 514c9d3a0c
Former-commit-id: a984e7ac9a
 2014-05-27 18:23:38 -05:00
Nate Jensen
4c86d662de Merge "Omaha #2670 Fix airep manifest to work with CAVE spring." into omaha_14.4.1 
Former-commit-id: 18a3239fd5 [formerly 5be7360043 [formerly d9d68507505fa1b45f47a6b92148dca7884ccb1b]]
Former-commit-id: 5be7360043
Former-commit-id: 3747f80c89
 2014-05-27 15:49:00 -05:00
Nate Jensen
9b29ff9114 Merge "Omaha #2668 add support for data access framework to bufrua." into omaha_14.4.1 
Former-commit-id: 73cf62dc96 [formerly 01b511e1c9 [formerly 5a27ea58134dd64fcf684829b997cbd441f2c22e]]
Former-commit-id: 01b511e1c9
Former-commit-id: 71847c47e9
 2014-05-27 15:48:42 -05:00
Nate Jensen
f20d887d7f Merge "Omaha #2669 add support for data access framework to pirep." into omaha_14.4.1 
Former-commit-id: b33ef5efe6 [formerly 21ccf324eb [formerly cb577d0a1eaa604825df83e3b8d2f7476b37d23f]]
Former-commit-id: 21ccf324eb
Former-commit-id: 38bef10b88
 2014-05-27 15:48:12 -05:00
Ben Steffensmeier
33dcd6c656 Omaha #2669 add support for data access framework to pirep. 
Former-commit-id: dd13f31356 [formerly 7570a24b10 [formerly c37d85ba479b8df38c90df522059b0c58eea6005]]
Former-commit-id: 7570a24b10
Former-commit-id: 0be1e981aa
 2014-05-27 15:20:09 -05:00
Greg Armendariz
c7f349d5a5 Omaha #3215 - Correct script 
Former-commit-id: 73765c31ca [formerly ac528037a1 [formerly 2565b4c918f9215fd65a5dc44778db3a200da8bf]]
Former-commit-id: ac528037a1
Former-commit-id: 9c26a31d27
 2014-05-27 15:19:37 -05:00
Ben Steffensmeier
ca7c26b11a Omaha #2670 Fix airep manifest to work with CAVE spring. 
Former-commit-id: 942bf638af [formerly 46d737e01b [formerly 7dccca4d1c97ea8d97fb46b8ef1fa139a92b22b5]]
Former-commit-id: 46d737e01b
Former-commit-id: d47c9fbd9c
 2014-05-27 15:19:05 -05:00
Ben Steffensmeier
cb7a4ef445 Omaha #2668 add support for data access framework to bufrua. 
Former-commit-id: 0138296c13 [formerly 2c9de12c6f [formerly 8ef33409df31f8ab9d69828b2d13e1bd8e979685]]
Former-commit-id: 2c9de12c6f
Former-commit-id: 6d2db6c21f
 2014-05-27 15:16:08 -05:00
Greg Armendariz
aa9938b51b Merge "Omaha #3215 - Add option for RPM build," into omaha_14.4.1 
Former-commit-id: 43f18d2770 [formerly 5c5e3605e7 [formerly 7b2bd85ea00ab8030f5577b945c6c716e1da6dc4]]
Former-commit-id: 5c5e3605e7
Former-commit-id: 92b83788e4
 2014-05-27 15:08:37 -05:00
Greg Armendariz
45856116c0 Omaha #3215 - Add option for RPM build, 
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5

Former-commit-id: a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]
Former-commit-id: 265a455ca1
Former-commit-id: 0806135d2e
 2014-05-27 14:56:33 -05:00
Nate Jensen
98644dba4d Merge "Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1 
Former-commit-id: 6d717294d8 [formerly e945207c1d [formerly 4f50b471f3f841e0cad14957ef1daec79afbe2b3]]
Former-commit-id: e945207c1d
Former-commit-id: b60ef3fbc6
 2014-05-27 14:18:57 -05:00
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
Nate Jensen
02bac98036 Merge "Omaha #2670 add support for data access framework to airep plugin." into omaha_14.4.1 
Former-commit-id: 23e376f738 [formerly 094d09c7c5 [formerly 00dae50c7c609a0ce07a5c155ffb6d6bee3d4c2f]]
Former-commit-id: 094d09c7c5
Former-commit-id: 29a07790b8
 2014-05-27 13:42:20 -05:00
Ben Steffensmeier
3685cc7cbf Omaha #2670 add support for data access framework to airep plugin. 
Former-commit-id: 46c69e7d74 [formerly a58bc7a8d4 [formerly 56c528cf5727954431298c955a506d54cd5921ad]]
Former-commit-id: a58bc7a8d4
Former-commit-id: 80fa485848
 2014-05-27 13:38:09 -05:00
Bryan Kowal
d17ee734da Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version. 
Rebased on re-compiled on the latest version of the nativeLib code.


Former-commit-id: c711ab9195 [formerly f1258ef865 [formerly b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a]]
Former-commit-id: f1258ef865
Former-commit-id: 7341d90341
 2014-05-27 13:16:37 -05:00
Slav Korolev
78d009705b Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager. 
Former-commit-id: 81033087ea [formerly e3fe3c9736 [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]
Former-commit-id: e3fe3c9736
Former-commit-id: adba0cd20a
 2014-05-27 12:24:50 -04:00
Brian Clements
00d3fbad8f Omaha #3152 switched radar server to use logback instead of log4j 
removed unneeded custom rolling file appender
replaced log4j config with logback config


Former-commit-id: 132bd3948d [formerly f6e7dffe61 [formerly ae91e2e2069f73bc661d0009a5d5c083a9d2a229]]
Former-commit-id: f6e7dffe61
Former-commit-id: f84333e1ce
 2014-05-27 11:11:12 -05:00
Brian Clements
ab3fbc6f09 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: 2fd2b5aa16 [formerly 6f76a9a328 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]
Former-commit-id: 6f76a9a328
Former-commit-id: f0e8bf76a9
 2014-05-23 17:04:49 -05:00
Brian Clements
b75fbf3c0a Omaha #3199 new edex.soap plugin 
new plugin for soap utilities


Former-commit-id: 09fba26a56 [formerly 4b984b2d70 [formerly 7c7f7f4f4a821a80d0bf6dcb7e59e3880a7bf4e2]]
Former-commit-id: 4b984b2d70
Former-commit-id: a94cf29ab5
 2014-05-23 14:51:20 -05:00
Steve Harris
3f2efef88b Merge branch 'omaha_14.3.1' (14.3.1-6) into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.level/utility/common_static/base/level/alias/gempak.xml

Former-commit-id: 7da3d7461f [formerly 211e5f8197 [formerly c678b56c81cb5ff798b5fcea75e00473c39fd53e]]
Former-commit-id: 211e5f8197
Former-commit-id: 498ff9235d
 2014-05-23 08:16:43 -05:00