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

3255 commits

Author SHA1 Message Date
Nate Jensen
6b835dc3cb Merge "Omaha #3232 Radar code improvements." into omaha_14.4.1 
Former-commit-id: 4dbf0be26c [formerly 5e9faea6e7] [formerly 3b324093ae] [formerly 4dbf0be26c [formerly 5e9faea6e7] [formerly 3b324093ae] [formerly 920e53628b [formerly 3b324093ae [formerly 22a5da1feff7e30ea0408f089305d95657befad2]]]]
Former-commit-id: 920e53628b
Former-commit-id: 16461f7204 [formerly f2d753fa64] [formerly 3359ee9c8061b5996314083928ff3cee94ee634a [formerly c0f047b24f]]
Former-commit-id: 760f4e543af4ad84e3fd2053a243af7a6973ac2f [formerly 24f7247805]
Former-commit-id: 10350a1337
 2014-06-05 17:38:32 -05:00
Ben Steffensmeier
6dd09f3b8d Omaha #3232 Radar code improvements. 
Former-commit-id: d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly d2587a7d57 [formerly 3eb6b79c56] [formerly 8587b9b43b] [formerly 26325b57be [formerly 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]]]]
Former-commit-id: 26325b57be
Former-commit-id: cdd8eb2d9e [formerly 4f83edfa72] [formerly a96d770a2e60482e10653300e2065d1100acb73d [formerly b8fe181c9a]]
Former-commit-id: fe8e7c1d08bafbe62409a3a17d56f49166d9b87c [formerly 9e97750df2]
Former-commit-id: dc5a927bb8
 2014-06-05 14:53:25 -05:00
Roger Ferrel
941e79020b Omaha #3098 Changes to also look at 'Wx' occasional (TEMPO) data. 
Change-Id: Ide97fbfd93bf06a6d708bf6fbd74349000ba2ed5

Former-commit-id: cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly cb5070f384 [formerly 7510cc23af] [formerly e1c011b157] [formerly 10e7a33f08 [formerly e1c011b157 [formerly 3e976b7ed5cf46687bbb76073e53f35ffc2c2812]]]]
Former-commit-id: 10e7a33f08
Former-commit-id: 48dd32b752 [formerly e799ce4c59] [formerly e5bd21828e3c3092ef9dcb90f6991be60f99b48d [formerly aa085d9e59]]
Former-commit-id: 9eefab3c342160e3dcf89f23c7d7c9b414c299b8 [formerly 050c2e87e7]
Former-commit-id: b575bb7de2
 2014-06-04 08:14:06 -05:00
Ben Steffensmeier
6a9568162c Omaha #3163 Fix collaboration string differencing 
Former-commit-id: 6e70040ee2 [formerly 2c534e177e] [formerly ca2210b3e7] [formerly 6e70040ee2 [formerly 2c534e177e] [formerly ca2210b3e7] [formerly 310e6562e6 [formerly ca2210b3e7 [formerly e6f30c822de26bafae339a8871c4ba98100e6d1a]]]]
Former-commit-id: 310e6562e6
Former-commit-id: 3ebd687ef6 [formerly 2b82c39a59] [formerly 3ade28600af95cf3d306987c41b0f340bb4a9ddd [formerly 72f1d7c950]]
Former-commit-id: 15110978aad7a1d308063e620f5b3f2ae1951641 [formerly b40e97f5ac]
Former-commit-id: f403929612
 2014-06-03 13:51:46 -05:00
Ron Anderson
492d3fce39 Omaha #3052 Improved TopoQuery error handling to throw exceptions with useful error messages. 
Change-Id: Ic181682611801ea244b986e8a2ce1400c4dc15d1

Former-commit-id: 49d4eba710 [formerly bd50ae9854] [formerly 3f169399b8] [formerly 49d4eba710 [formerly bd50ae9854] [formerly 3f169399b8] [formerly 304364e356 [formerly 3f169399b8 [formerly 0d42d4fdc56122c3df912c93e5e09b0ab28c1b37]]]]
Former-commit-id: 304364e356
Former-commit-id: 9b0c3f2355 [formerly 060b0221fa] [formerly bba329f4d5727f79bd95b57a11fd41ca3994a509 [formerly 3ff441f9da]]
Former-commit-id: 0d5de25d2e6c39b305e848012322ce2570f429ed [formerly 7171bc6f0a]
Former-commit-id: b98936356f
 2014-06-02 17:14:18 -05:00
Nate Jensen
e344f4e70b Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1 
Former-commit-id: 8fa99462e6 [formerly 4be10cf1e6] [formerly d94a040f29] [formerly 8fa99462e6 [formerly 4be10cf1e6] [formerly d94a040f29] [formerly a862846e15 [formerly d94a040f29 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]]]
Former-commit-id: a862846e15
Former-commit-id: 36266f1d8f [formerly 711661870f] [formerly e40e41702ed68ec295277570a93d814c4d06cd99 [formerly 1f4daca6e3]]
Former-commit-id: be6975c458e64c7d3a5750944272f6e4145bd715 [formerly ba546c3001]
Former-commit-id: cf3a5b9a53
 2014-06-02 12:44:17 -05:00
Steve Harris
cbd6f7c310 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: 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 2b95865dec [formerly 647cd97e29] [formerly 7fec0d039c] [formerly 455eb8b39d [formerly 7fec0d039c [formerly 45250149681f057cf168f4d3cb27276279f62c05]]]]
Former-commit-id: 455eb8b39d
Former-commit-id: b1f34a5dd0 [formerly 373c816e6a] [formerly c52c0623361b5124ad656838a838096ff392d903 [formerly ec743199f1]]
Former-commit-id: 7d167287b3c5d094c77e241af01ad8945f4a9c0b [formerly cbceb4ea62]
Former-commit-id: 7eabeb7ad6
 2014-06-02 11:21:46 -05:00
Ben Steffensmeier
eb45b78812 Omaha #2918 Synchronize mosaic dataTimes. 
Former-commit-id: 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly 8aff2fc4a1 [formerly 93ce7ddb33] [formerly 8a117864d8] [formerly b078baf67d [formerly 8a117864d8 [formerly c4d8ed9d0d7eb4c17d8a0922302a3fc50a0ae383]]]]
Former-commit-id: b078baf67d
Former-commit-id: 669c4e0745 [formerly a97f9cd7e6] [formerly cbd57f8d6748ba12892e46cd85d33d887aa145c9 [formerly b4e1a98e23]]
Former-commit-id: c5d60e84cf3fe1eb4e53e28f3cca0abf7736b7e2 [formerly cbe8c64e73]
Former-commit-id: 25b2aeeed2
 2014-06-02 10:41:45 -05:00
Steve Harris
6fdbdfaf97 Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1 
Former-commit-id: be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly be2931c623 [formerly 4e26e224fd] [formerly 65a3390a6a] [formerly 3bde6b3e41 [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]]]
Former-commit-id: 3bde6b3e41
Former-commit-id: 19f6fb968d [formerly 0edb16b05e] [formerly 674e8b1e2a9d464297f8e67d7a040e71d9e9e815 [formerly c3deafc840]]
Former-commit-id: e6ce649c9482699a06a1c902b2125fedd05ea2f0 [formerly 46b7122d56]
Former-commit-id: 9aa3a5a035
 2014-06-02 07:31:14 -05:00
Ron Anderson
6277338923 Omaha #2841 Fix errors when formatters fail to queue due to pending limit. 
Change-Id: Icf70e25369a23b7b554718cf235feda02e615f0d

Former-commit-id: 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 217e4e7ba5 [formerly 916e607254] [formerly 1108744b40] [formerly 22d67fcad1 [formerly 1108744b40 [formerly b15cb1632b58c415399ccc8dee6cf2c13140355f]]]]
Former-commit-id: 22d67fcad1
Former-commit-id: c3c6922ca9 [formerly 808254cd31] [formerly d4135f29979a9a7a46bf93cbfb0448b5916e82d3 [formerly 33abe4a8d3]]
Former-commit-id: fd2ba64516f8f24b1dccef988173407320b01d1d [formerly ecaa8ab0a9]
Former-commit-id: 14f0f927bf
 2014-05-30 10:47:28 -05:00
Brian.Dyke
408ecfa5c0 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: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
 2014-05-30 10:46:25 -04:00
Ron Anderson
82e73f875d Merge "Omaha #2841 Separate queuing of text formatters and product scripts." into omaha_14.4.1 
Former-commit-id: 3a27c2fe6e [formerly 27a9790684] [formerly 8309a5656a] [formerly 3a27c2fe6e [formerly 27a9790684] [formerly 8309a5656a] [formerly 7df866b471 [formerly 8309a5656a [formerly e13f80b81df762d6658cce9ad534dc499791ba46]]]]
Former-commit-id: 7df866b471
Former-commit-id: c64699d4eb [formerly f1a6e6735c] [formerly 00d9ffc82e7030f579603f67ec3703147a3de16a [formerly ff31990a13]]
Former-commit-id: b94ceb10ce25dbb3d80380a393f49fdced75782f [formerly 30495f52db]
Former-commit-id: 9d6658f1e9
 2014-05-29 18:50:52 -05:00
Ron Anderson
4c8754f963 Omaha #2841 Separate queuing of text formatters and product scripts. 
Change-Id: I4bfab25d4563914e7390b59d1717e8c82b016eb8

Former-commit-id: 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 2dec43f246 [formerly ce4047869c] [formerly a9f3b486f3] [formerly 8e1f4331da [formerly a9f3b486f3 [formerly 216be7d4dd6da9aefbdd6c55e9fd09f1a60bc53a]]]]
Former-commit-id: 8e1f4331da
Former-commit-id: 4669662fd9 [formerly 4d32cb561d] [formerly 654ed9178d63556b1133e4a0292cb347f920a036 [formerly f765c74e5e]]
Former-commit-id: e76c485f2f8d98e7e56b4624ca020b2e690ecf56 [formerly 114532dd8d]
Former-commit-id: 0c06544416
 2014-05-29 16:55:02 -05:00
Richard Peter
bd6423f675 Omaha #3223 - Remove DD dependencies from AWIPS2_baseline 
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly e2288769d3 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]]
Former-commit-id: e2288769d3
Former-commit-id: 23139f8b26 [formerly 121f0e00a4] [formerly 09f159abf4832d87decaa358207e37a58cf4a25a [formerly 220f7aa97a]]
Former-commit-id: 572b1480c60b64aa0cd08b4a426d8f2efe5a6538 [formerly 8ba13f812e]
Former-commit-id: aaab5e310f
 2014-05-29 15:50:59 -05:00
Steve Harris
36e61bde42 Omaha #3223 - move data delivery plugins to a separate Data_Delivery repository 
Change-Id: Ib313d71006c3d23a76c1589fded47102fea80b9a

Former-commit-id: c4811405d5 [formerly f857812561] [formerly 79d5592fdf] [formerly c4811405d5 [formerly f857812561] [formerly 79d5592fdf] [formerly 5bc251beaa [formerly 79d5592fdf [formerly c944b3b98f68b8f65b853fb244002e3382dc38a2]]]]
Former-commit-id: 5bc251beaa
Former-commit-id: 615000d2ac [formerly 4af6e9f137] [formerly 18e12b1f641bb24f938a1a404f4f4a402bfdfc30 [formerly c830097b13]]
Former-commit-id: bd335dcc303b3ea0976df0c7b54fb55dfae737f2 [formerly 77e18c2e9a]
Former-commit-id: b09109b66e
 2014-05-29 13:42:09 -05:00
Roger Ferrel
196e1fa22d Omaha #3171 Change Archive Retention labels. 
Change-Id: I42cbf2aae820c75564bba7dfbd4d7b2589b9e085

Former-commit-id: 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 176a2fb8cf [formerly eebc5096b2] [formerly 44a23b4500] [formerly 825e2c1b19 [formerly 44a23b4500 [formerly 1249deb91b6463044a59ca564e26f82612f52d40]]]]
Former-commit-id: 825e2c1b19
Former-commit-id: 8ab7513068 [formerly 73be1f66e9] [formerly edd5113dfda01da0c2e182625ddc3f1b5c02231b [formerly 15545c5239]]
Former-commit-id: 0d93eba78efa2bd1b9ec5aa5f43168c99f377894 [formerly 6c78b5e04c]
Former-commit-id: c882871747
 2014-05-29 12:33:15 -05:00
Nate Jensen
0445850b36 Merge "Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager." into omaha_14.4.1 
Former-commit-id: ecc95c47da [formerly 6fc643af39] [formerly 3e174fe39c] [formerly ecc95c47da [formerly 6fc643af39] [formerly 3e174fe39c] [formerly 8cc13d8334 [formerly 3e174fe39c [formerly db3ff4b3bf81cbea49169369be01ce5c919157fd]]]]
Former-commit-id: 8cc13d8334
Former-commit-id: dbc8186d11 [formerly c7da2eec51] [formerly 8eeba1773f2b4d96a73c8ec75449d2a752e5168c [formerly a921570418]]
Former-commit-id: 5eed1c0c07991bd98d3f44c5d03942a59f1fa1d0 [formerly fda484c9ff]
Former-commit-id: d1f08dcaf1
 2014-05-28 12:43:12 -05:00
Ron Anderson
1b11561f3a Merge "Omaha #3110 Permanent fix for mutable database creation." into omaha_14.4.1 
Former-commit-id: 8f56396ad7 [formerly 8b580a891d] [formerly da0a173698] [formerly 8f56396ad7 [formerly 8b580a891d] [formerly da0a173698] [formerly 8b5daad4db [formerly da0a173698 [formerly 3869a36a6cad1674e8ec493d03937c21ddde7f21]]]]
Former-commit-id: 8b5daad4db
Former-commit-id: 8977f7f287 [formerly 0198ceb40a] [formerly 0f497e9315d5a30c2ac3076741001253d4391824 [formerly 191283e96d]]
Former-commit-id: 2bc767e870bc88ec0c846c854a4638e97bd9cf08 [formerly 81c044d476]
Former-commit-id: c237fd2699
 2014-05-28 11:59:51 -05:00
Nate Jensen
247e4688fe Merge "Omaha #3133 Removed dead hydro code and related dependencies" into omaha_14.4.1 
Former-commit-id: e53ec8ab82 [formerly 719c53a044] [formerly 905fa8f283] [formerly e53ec8ab82 [formerly 719c53a044] [formerly 905fa8f283] [formerly e7dc89cddd [formerly 905fa8f283 [formerly 55cf25f0671f17e667f7c785f3580a93267f8790]]]]
Former-commit-id: e7dc89cddd
Former-commit-id: f0e019a24e [formerly 3f434ea6e9] [formerly 438dc2f8d1d87ff82e08c3c62233bc895b389264 [formerly 05b1401849]]
Former-commit-id: 62ebd5d7dedd4386ff43940345af53aa853509e0 [formerly e4df449f49]
Former-commit-id: d7cba4a465
 2014-05-28 10:28:49 -05:00
Ron Anderson
fb8e1e58ce Omaha #3110 Permanent fix for mutable database creation. 
Former-commit-id: aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly aabc6e4fa4 [formerly 17da90e8db] [formerly 4633de4ea3] [formerly b7271025f9 [formerly 4633de4ea3 [formerly a0001c9ed3d414237069f43a29dd907111c16832]]]]
Former-commit-id: b7271025f9
Former-commit-id: 22a49335df [formerly 3e5acbf168] [formerly dff7778150c988782c4a53e9f37ff7197bd54d3d [formerly f2733999de]]
Former-commit-id: 5d7d6fc51a102e81f0fa290cf5c214633a85a5aa [formerly b6b463682f]
Former-commit-id: 1f4bde25d9
 2014-05-28 10:09:12 -05:00
Steve Harris
86d6a0cd4d 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: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
 2014-05-28 09:01:00 -05:00
Steve Harris
6281b0148d 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: 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 835486c63f [formerly a4825f4b27] [formerly 2c49d14c12] [formerly 048d3748b7 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]]]
Former-commit-id: 048d3748b7
Former-commit-id: 5469a5e863 [formerly 005e5b4ee2] [formerly 07a1965ea47f8ad30b0325329a0a7da148a19824 [formerly 4ed44b6e72]]
Former-commit-id: 84d3011f8d7a6ba7981aad3e8439f3e517ebf403 [formerly 95462b4f80]
Former-commit-id: 1f24080b8e
 2014-05-28 07:41:42 -05:00
Nate Jensen
2bdb8b5c7d Omaha #3133 Removed dead hydro code and related dependencies 
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a

Former-commit-id: 424c3c1334 [formerly a984e7ac9a] [formerly 514c9d3a0c] [formerly 424c3c1334 [formerly a984e7ac9a] [formerly 514c9d3a0c] [formerly 67ac5fa242 [formerly 514c9d3a0c [formerly 13d3dc45edab66106e9aa5a1149ca05e94d144c3]]]]
Former-commit-id: 67ac5fa242
Former-commit-id: d158b501d1 [formerly a25a8b69eb] [formerly 099854edf99632506bb755ffc5aca3c18d75e846 [formerly c2f78a6888]]
Former-commit-id: f47e70dc4dbf336cc1d0b9233dc58c9148bc4c9a [formerly 11899e65e2]
Former-commit-id: caf433d525
 2014-05-27 18:23:38 -05:00
Steve Harris
cf2950abdb 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: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
 2014-05-27 14:48:24 -04:00
Slav Korolev
18134b5093 Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager. 
Former-commit-id: 78d009705b [formerly adba0cd20a] [formerly e3fe3c9736] [formerly 78d009705b [formerly adba0cd20a] [formerly e3fe3c9736] [formerly 81033087ea [formerly e3fe3c9736 [formerly 14ff7a84235ed8cc95aca488910e7f975a5bd41e]]]]
Former-commit-id: 81033087ea
Former-commit-id: 2d330b6849 [formerly 55b01dce6d] [formerly ffff3de7255ddc5811bb800ab442d18dc7fb0afc [formerly 4a8e7fc38e]]
Former-commit-id: 4e04ae2abf2ea5763d2bc71363ef09579b4737e9 [formerly ced313a7f1]
Former-commit-id: bcc5a458b3
 2014-05-27 12:24:50 -04:00
Brian Clements
e74238420c 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: ab3fbc6f09 [formerly f0e8bf76a9] [formerly 6f76a9a328] [formerly ab3fbc6f09 [formerly f0e8bf76a9] [formerly 6f76a9a328] [formerly 2fd2b5aa16 [formerly 6f76a9a328 [formerly d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2]]]]
Former-commit-id: 2fd2b5aa16
Former-commit-id: 07ca1bd6f1 [formerly 170e3644f2] [formerly 2a1c7acc76cba12f824a34907eb1e36e3c0f3282 [formerly af8a6806f0]]
Former-commit-id: 465c5cbe251ce81e007b7740192fed920a858efe [formerly e88d9a2e8c]
Former-commit-id: d75008101f
 2014-05-23 17:04:49 -05:00
Nate Jensen
abecfff03c Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1 
Former-commit-id: 578f6db26e [formerly 730831d465] [formerly 8f6dcfaa1b] [formerly 578f6db26e [formerly 730831d465] [formerly 8f6dcfaa1b] [formerly b67bf1e492 [formerly 8f6dcfaa1b [formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]]]
Former-commit-id: b67bf1e492
Former-commit-id: c493578400 [formerly 76a2766ed4] [formerly 4c9bc1d65ae09f27e7b46fc8edbe62f9fdbbfdf1 [formerly 935086d60e]]
Former-commit-id: 48766d653a272575430a34c250f7a621648883ac [formerly dcfd7a07eb]
Former-commit-id: 25e4982cb3
 2014-05-22 16:46:50 -05:00
Steve Harris
3c9f653212 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: f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly b6af2db9f5 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 0fbeb1a165 [formerly 1dfc15a77e] [formerly 7d53b80294c5865df861c5b6db7d9a9380d06252 [formerly 14b1ea307f]]
Former-commit-id: 88f5f48abba58273dd5fee5505a2fe8efb91f86c [formerly d226dfb021]
Former-commit-id: e30dfd21ee
 2014-05-22 14:31:06 -05:00
Brian Clements
fed3c48de4 Omaha #3206 edex changes related to new javax.serlvet FOSS project 
Former-commit-id: 8471e4d8a4 [formerly 0a2ddfbc79] [formerly f9de79465a] [formerly 8471e4d8a4 [formerly 0a2ddfbc79] [formerly f9de79465a] [formerly c875f17719 [formerly f9de79465a [formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]]]
Former-commit-id: c875f17719
Former-commit-id: fb373ce2ae [formerly 53de96dd53] [formerly 237ff582f8e03604aecead381934b7cbbce1206d [formerly fd9f98b2ba]]
Former-commit-id: aca807b586f9c05844948db559226ed3b3f3f644 [formerly e7730e2219]
Former-commit-id: 67376b444a
 2014-05-22 14:09:07 -05:00
Steve Harris
2118803e86 Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1 
Former-commit-id: 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 74c5b0454c [formerly 0a3b23d055] [formerly 4899c4f56a] [formerly 2059fc9c0e [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]]]
Former-commit-id: 2059fc9c0e
Former-commit-id: aa266f6ded [formerly 805aae1a70] [formerly 075083683c45c73e61f607291d9d32a3cc865f27 [formerly 0df4af413b]]
Former-commit-id: ef4132ffa26246b1912b6d1234a3a9d9d473e8aa [formerly e7e48b2abb]
Former-commit-id: 5aca60f422
 2014-05-22 14:05:06 -05:00
Ron Anderson
b5414458d7 Issue #3194 Fix GeoTIFF import 
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a

Former-commit-id: 4c33bf1b30 [formerly a8ba16fc93] [formerly 52931af5ce] [formerly 4c33bf1b30 [formerly a8ba16fc93] [formerly 52931af5ce] [formerly 2a680b73ea [formerly 52931af5ce [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]]]
Former-commit-id: 2a680b73ea
Former-commit-id: 53f238a71a [formerly 8f0eb1fd10] [formerly 5bf8e1cb7607244d1101bece3a1e3dcc74e4a9a5 [formerly b7338080e2]]
Former-commit-id: 1b8f4a976ac80b88790a121b1754564820afd7a6 [formerly 0d54a37b6c]
Former-commit-id: 307f61e609
 2014-05-22 09:53:47 -05:00
Richard Peter
4bdd9aa874 Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1 
Former-commit-id: 4967854d11 [formerly dcaedf5d43] [formerly db4c6c8c22] [formerly 4967854d11 [formerly dcaedf5d43] [formerly db4c6c8c22] [formerly f19fda01ad [formerly db4c6c8c22 [formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]]]
Former-commit-id: f19fda01ad
Former-commit-id: 1709bda041 [formerly 9faf57cf68] [formerly 8ebf47a2dd962ac3dcf82db35d6caac8cbe3b762 [formerly 02b136759b]]
Former-commit-id: f504137ff732272d60b7cf200e8b3c97f1bf0702 [formerly 79a88d24ef]
Former-commit-id: 680a584473
 2014-05-20 17:14:29 -05:00
Brian Clements
20cb82cc98 Omaha #2536 merged edex.textdb into text plugins 
Former-commit-id: c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly c885bf9426 [formerly c55124bcc7] [formerly 5b5295e5ad] [formerly da7d5888b0 [formerly 5b5295e5ad [formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]]]
Former-commit-id: da7d5888b0
Former-commit-id: 39ab0e1a08 [formerly e4bb70cbe9] [formerly 909b50360144c1b7aaf549971a4592d7aee00d9c [formerly 003917f0ed]]
Former-commit-id: 21b6858b7cb89d1d240688b3c00b569a7c69d267 [formerly 30fb567666]
Former-commit-id: ebc9bfa351
 2014-05-20 16:07:20 -05:00
Richard Peter
ed4d9a6467 Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1 
Former-commit-id: 9df96cc326 [formerly ab3a7a2804] [formerly 13ac6e8337] [formerly 9df96cc326 [formerly ab3a7a2804] [formerly 13ac6e8337] [formerly 2d4d89b3f0 [formerly 13ac6e8337 [formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]]]
Former-commit-id: 2d4d89b3f0
Former-commit-id: 74de8945c0 [formerly 3264e7bd93] [formerly 52185ada2cfcc10553a7b9bec09caab66538337c [formerly 0b8c3e67a1]]
Former-commit-id: 055959a0e32f78a3f4d1d8670b525b15287f41a9 [formerly 580dd1ed1d]
Former-commit-id: 6bccbaccd1
 2014-05-20 14:56:44 -05:00
Nate Jensen
fe94471068 Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1 
Former-commit-id: 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 8dc3683186 [formerly 77c77c6b8f] [formerly 1e408e7017] [formerly 966cf1f96f [formerly 1e408e7017 [formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]]]
Former-commit-id: 966cf1f96f
Former-commit-id: 8f0913851f [formerly eb086ff461] [formerly bd9f4b599f4e6435264b1b4987d6628cb9848470 [formerly 88aa9471e1]]
Former-commit-id: 91d875f7810f65ff96178ec3352630c12832b221 [formerly 95ed06119c]
Former-commit-id: 9d1afa6876
 2014-05-20 14:51:05 -05:00
Brad Gonzales
ad3caf4a8f Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf. 
Amend: updated manifest.
       Removed static imports.
       Refactored String constants to Pattern constants in TafConstants.
       Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
       Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
       fixed .project.  Updated yet more Patterns.

Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc

Former-commit-id: 35afb44d4b [formerly c4890beb96] [formerly 6b0e578fc1] [formerly 35afb44d4b [formerly c4890beb96] [formerly 6b0e578fc1] [formerly e560ce4880 [formerly 6b0e578fc1 [formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]]]
Former-commit-id: e560ce4880
Former-commit-id: 3a75e82e7a [formerly 6825727400] [formerly 3e7024f11e766b0b3759f7dfe89c695683e8de9e [formerly e2412ecb43]]
Former-commit-id: 671ea5c32e2f34163202f6e31c76f0b42201d319 [formerly fea1c9febe]
Former-commit-id: 26953a7864
 2014-05-20 14:13:18 -05:00
Ben Steffensmeier
7d9d7e3b8a Omaha #2913 Remove dead code using JAI 
Former-commit-id: f010aa30b4 [formerly 59a108822e] [formerly d5d3f5605a] [formerly f010aa30b4 [formerly 59a108822e] [formerly d5d3f5605a] [formerly d48333444c [formerly d5d3f5605a [formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]]]
Former-commit-id: d48333444c
Former-commit-id: e34301d284 [formerly a56f475076] [formerly 20fefb3d504c7cb0e078b3c05a039e91830abbc4 [formerly 98ad1b079e]]
Former-commit-id: 5839ab166d879036ef28743bba99bc2000581f2c [formerly 4b940cb599]
Former-commit-id: 58e5704651
 2014-05-20 13:36:15 -05:00
Brian.Dyke
4671c25ea4 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java

Former-commit-id: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
 2014-05-20 14:35:34 -04:00
Ron Anderson
6fa737a051 Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update 
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465

Former-commit-id: 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 0e02e83629 [formerly b794dd04e1] [formerly 3b404f4083] [formerly 809548b283 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]]]
Former-commit-id: 809548b283
Former-commit-id: f80e9822d5 [formerly fd6e80dd27] [formerly c78c2ff04c4d5c9559341c2f0e958d54366110f4 [formerly 029201d4b9]]
Former-commit-id: cd13fa3b4f04702ca8feffa0cdc0dff76b7311b3 [formerly 3f20fc86df]
Former-commit-id: 31da20ef5b
 2014-05-20 11:10:26 -05:00
Brian Clements
0f25e9985e Omaha #3172 fixed ui filtering for contacts and sessions 
Former-commit-id: 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 83654c374a [formerly 455af3612f] [formerly b774503931] [formerly 8dce7e9b85 [formerly b774503931 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 99aa4f0609 [formerly c4447fc6c4] [formerly 37f456b3eef102abf5d925b72829fa1b004f3f65 [formerly 4078bbaa63]]
Former-commit-id: 96f3e9e0d2145c1f447ab45ea7213e6832a6a06b [formerly 213aab834f]
Former-commit-id: f0ce9a6ca8
 2014-05-20 11:04:57 -05:00
Nate Jensen
cb5a4c33a7 Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1 
Former-commit-id: 8adbef2eb1 [formerly f3f64b1e5a] [formerly 8d7125544b] [formerly 8adbef2eb1 [formerly f3f64b1e5a] [formerly 8d7125544b] [formerly eff69410eb [formerly 8d7125544b [formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]]]
Former-commit-id: eff69410eb
Former-commit-id: a443660d7d [formerly cc8ba31981] [formerly 992568714810b0ef9318a88418c257799eaef5a2 [formerly 7def9ead8e]]
Former-commit-id: e2223fc6604bf2193e94293987888702bc2dcaf5 [formerly 1b18fd4584]
Former-commit-id: 508d1a8224
 2014-05-19 16:21:37 -05:00
Richard Peter
877097044b Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1 
Former-commit-id: 48236cfcee [formerly 80a5f2fc1b] [formerly 40b7623c87] [formerly 48236cfcee [formerly 80a5f2fc1b] [formerly 40b7623c87] [formerly 87da8bd952 [formerly 40b7623c87 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]]
Former-commit-id: 87da8bd952
Former-commit-id: fb6f0d55cb [formerly c799f78f5d] [formerly 8788f9f737d6065baf0186a4f7db19dc442c4b07 [formerly 8baf897297]]
Former-commit-id: eed964b1439a8daace72f6a3b52823282676ce1e [formerly 1776389eb7]
Former-commit-id: 69fea4c8b3
 2014-05-19 16:07:51 -05:00
Brian Clements
738a2c4513 Omaha #3180 fixed inviting strangers and multiple users in collaboration 
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: 5bf4c253f6 [formerly b5e961d6b4] [formerly 0e18d45bdf] [formerly 5bf4c253f6 [formerly b5e961d6b4] [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 0e18d45bdf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: bb827663c3 [formerly 6769aff618] [formerly 411223a0944f43546d208c57f0dc4a1e1af7c28d [formerly e4433c5e10]]
Former-commit-id: ed80a833a4a6585be47a91576eada507814b0659 [formerly 3c6a10e154]
Former-commit-id: 008c911f03
 2014-05-19 15:54:36 -05:00
Ben Steffensmeier
b43c70b8c9 Omaha #3133 remove topo from alertviz feature. 
Former-commit-id: a0ee307eaa [formerly c4f9bab999] [formerly 24b879764f] [formerly a0ee307eaa [formerly c4f9bab999] [formerly 24b879764f] [formerly 31c323151c [formerly 24b879764f [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]]
Former-commit-id: 31c323151c
Former-commit-id: 993d4eef85 [formerly 87118964b1] [formerly 6832b31f3fe574153feedb0de21e09ec9a1b84a5 [formerly 68aba0cdd5]]
Former-commit-id: c084cbfe1028c643222861ea3d1aa6f1217b1dfe [formerly 0e0229c560]
Former-commit-id: eeebf5ae7b
 2014-05-19 14:21:23 -05:00
Nate Jensen
f82739a56a Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1 
Former-commit-id: 2213e727a5 [formerly 9996d67317] [formerly 76bfba5945] [formerly 2213e727a5 [formerly 9996d67317] [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 76bfba5945 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 64bbc05d59 [formerly 6fb3e37a29] [formerly 5f078c4b443d0700579f8baea93b467a5c12c8b0 [formerly 65ecb7e926]]
Former-commit-id: b5519ce7829ea9a0fa009f22142c525449f05f59 [formerly 423bf2f21f]
Former-commit-id: 80b9e5ee6b
 2014-05-19 13:36:26 -05:00
Brian.Dyke
be5e377068 Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1 
Former-commit-id: 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly 432e5f15a5 [formerly c4b7b8dd74] [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f113398a16 [formerly f2885c9996] [formerly 9eb0d56ad4743d868045273e945e80f0d2e0674f [formerly f30bd7d9ae]]
Former-commit-id: b203c0e47900941c64b4992284bdc8701c374b29 [formerly 39d8bd9004]
Former-commit-id: 3d35be33cb
 2014-05-19 14:07:04 -04:00
Brian.Dyke
be2b29e0f3 CM-MERGE:OB13.5.5-8 into 14.1.2 
Former-commit-id: 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 75f7d77c45 [formerly 2eae2be646] [formerly b29db01a59] [formerly 06c2478539 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]]
Former-commit-id: 06c2478539
Former-commit-id: 534d211494 [formerly 3558d8f162] [formerly 8d732a149cd7483006dfc9f0e4e9c03c2adcc03f [formerly 9baa09f4bc]]
Former-commit-id: 976e0f4a32e004b04954001cee7a9831fc35972a [formerly c88e8d41b6]
Former-commit-id: b65a3a3214
 2014-05-19 13:26:45 -04:00
Richard Peter
cad8249e2c Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1 
Former-commit-id: 5e9b10b8bf [formerly 1e9c2b27b6] [formerly 0f9015e824] [formerly 5e9b10b8bf [formerly 1e9c2b27b6] [formerly 0f9015e824] [formerly 0480bfa478 [formerly 0f9015e824 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]]
Former-commit-id: 0480bfa478
Former-commit-id: 5a2f5b67ad [formerly f3e7d16402] [formerly bc1663d9924390592b3ba3a6621bf69d61d488b3 [formerly 802a043085]]
Former-commit-id: e3fae294998abb49d71e44f535bbea2d9cf2f6d8 [formerly fa926cd515]
Former-commit-id: 8a71079141
 2014-05-19 12:12:05 -05:00
Nate Jensen
47def6ec0f Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1 
Former-commit-id: 6acbf3b921 [formerly b93e410f60] [formerly cb6ef0e9a3] [formerly 6acbf3b921 [formerly b93e410f60] [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly cb6ef0e9a3 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]]
Former-commit-id: d79ef53ad0
Former-commit-id: 72f76d8ab8 [formerly c5d944c52f] [formerly dcff3b3cdb0eb2c3f3e967382ea0a1dd9cb38826 [formerly 8a31eaf6e1]]
Former-commit-id: d5ba7cfcdf041c0b65a97f29c000bda36d61d299 [formerly 0bc127a4e9]
Former-commit-id: b7f846ac6d
 2014-05-19 11:46:10 -05:00
Brian Clements
8314a7e231 Omaha #2536 merged uf.edex.textdbsrv into text plugins 
split into uf.common.dataplugin.text and uf.edex.plugin.text


Former-commit-id: 1d1f0ae9aa [formerly 4d40a98ad7] [formerly a06d332ff4] [formerly 1d1f0ae9aa [formerly 4d40a98ad7] [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly a06d332ff4 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 09827edcad [formerly 7761b74112] [formerly fc7a13b2cb8827e53d044de3c6b67b9d95add1a1 [formerly 8ddae2fc54]]
Former-commit-id: 4f0420122d9abd475daba4372305eab7b23699b9 [formerly f61d1ac976]
Former-commit-id: de232ae55c
 2014-05-19 10:53:37 -05:00