Commit graph

506 commits

Author SHA1 Message Date
Ron Anderson
8b6d77e18a Issue #2287 Fix yet another NullPointer in GFEColorBarResource
Change-Id: I96ff6cdff49d444f4cb90fb219531901c19460ae

Former-commit-id: 5835b2d4fd [formerly 37d94d921b] [formerly 5835b2d4fd [formerly 37d94d921b] [formerly 2e24094983 [formerly dabdce1482cc80b794e8f82ac55d6867a43f0c89]]]
Former-commit-id: 2e24094983
Former-commit-id: a1a58c2d35 [formerly dc1323010c]
Former-commit-id: 28d7012eda
2013-08-29 17:38:01 -05:00
Ron Anderson
8349930763 Issue #2287 Fix null pointer in GFEColorBarResource
Change-Id: I477a7d5cc58e61b9d521337a94801114cecde62a

Former-commit-id: 59c8dc4fae [formerly 4e768e812d] [formerly 59c8dc4fae [formerly 4e768e812d] [formerly 8f8e041802 [formerly add48ba3bbf77e6e7cbfa756e6da75c78aab6f0f]]]
Former-commit-id: 8f8e041802
Former-commit-id: 4cbdeefa33 [formerly 316ba03c10]
Former-commit-id: d782787ec6
2013-08-29 16:53:55 -05:00
David Gillingham
5ebf2e8647 Issue #2250: Fix class loader errors in GFE formatter launcher uncovered by JUtil changes.
Change-Id: I311346a8df2bf086bfb847c582f80bdf3f24df66

Former-commit-id: a755da7827 [formerly defcdd8439] [formerly a755da7827 [formerly defcdd8439] [formerly 38ff19295e [formerly 6b5a723a00c1451ac0df3743b948822f8298275b]]]
Former-commit-id: 38ff19295e
Former-commit-id: 01b5cca91d [formerly a88b9a5317]
Former-commit-id: b4937bc84b
2013-08-29 14:20:23 -05:00
Ron Anderson
05224fd829 Issue #2287 Fixed fitToDataColorTable for Single Grids
Change-Id: I00325b40af3803bd0cfed601371904e5e24c1abe

Former-commit-id: 344db44bc7 [formerly 37795f1407] [formerly 344db44bc7 [formerly 37795f1407] [formerly 0b6ec808f2 [formerly 1cffae67f0150e1a2b1509e560383aa506e4284f]]]
Former-commit-id: 0b6ec808f2
Former-commit-id: 078a619cf8 [formerly 561d4cce0b]
Former-commit-id: a70032a961
2013-08-29 13:36:04 -05:00
Ron Anderson
5ff2d27371 Issue #2302 Fixed simultaneous save issue. Cleaned up AutoSave.
Change-Id: I3d9b8b2441a0b79d393ab4591450b084d24dafc3

Former-commit-id: 66032fcfd7 [formerly f75dc91293] [formerly 66032fcfd7 [formerly f75dc91293] [formerly ab4c1ebe5d [formerly 29e2ea5d61af71a366d3a81908b16b4c6a6850f6]]]
Former-commit-id: ab4c1ebe5d
Former-commit-id: 877f9b9bc3 [formerly 2670db83fd]
Former-commit-id: c71a74ef01
2013-08-27 18:54:14 -05:00
Ron Anderson
24f43305b3 Issue #2287 Fix scaling and direction of wind/swell arrows in GFE
Change-Id: Id12823256fc3c383005098b83e72249284a36f33

Former-commit-id: df357588a0 [formerly 77db16933e] [formerly df357588a0 [formerly 77db16933e] [formerly 803515f4ff [formerly b0c88cb7d71cf3e081596cd47d88d8412c2ea3d1]]]
Former-commit-id: 803515f4ff
Former-commit-id: a1952b7c75 [formerly 518e32206e]
Former-commit-id: d4a2df4eb5
2013-08-27 13:51:17 -05:00
Ron Anderson
7928912dc5 Issue #1571 Refactored GFE to store GridParmInfo and ParmStorageInfo in PostGres
Change-Id: Iae7cf49fc18abf03ef3b0ee498fb8e658f37d1cf

Former-commit-id: 3fd2f523d9 [formerly 04d2fdc214] [formerly 3fd2f523d9 [formerly 04d2fdc214] [formerly 5aee6f35ff [formerly 3094dc247a6de94ff00321d093b431e3f401b0c5]]]
Former-commit-id: 5aee6f35ff
Former-commit-id: 06cbd815be [formerly f0fb2391af]
Former-commit-id: ddf03d171e
2013-08-20 17:16:21 -05:00
Max Schenkelberg
f553c93092 Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: bbad83c21a [formerly 6f60751ec6] [formerly bbad83c21a [formerly 6f60751ec6] [formerly c5575f9624 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 8139e0dfb7 [formerly 8de539020d]
Former-commit-id: 451eb54a36
2013-08-15 12:21:43 -05:00
Richard Peter
42c78326f1 Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 1f32ef9c7a [formerly 5e5047cc4f] [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: c0b0eef331 [formerly db7c941f6f]
Former-commit-id: 9cf5e247ab
2013-08-14 15:23:18 -05:00
Steve Harris
d0be6956e9 13.5.1-15 baseline
Former-commit-id: 535218c676 [formerly 53e96e21db] [formerly 535218c676 [formerly 53e96e21db] [formerly c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: 4f9288e7c1 [formerly 65beefde58]
Former-commit-id: 9ea3f0c215
2013-08-14 10:24:26 -04:00
Nate Jensen
bfca6dac18 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 78256fd891 [formerly df95db8f78] [formerly 78256fd891 [formerly df95db8f78] [formerly 0c92461c65 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 988ac46c2b [formerly bf821fdbe0]
Former-commit-id: 276f78d5f3
2013-08-13 09:09:05 -05:00
Greg Armendariz
244bc3ac37 13.5.1-12 baseline
Former-commit-id: 01d067cff9 [formerly c9898ba8d1] [formerly 01d067cff9 [formerly c9898ba8d1] [formerly fe51885ba7 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]
Former-commit-id: fe51885ba7
Former-commit-id: f777a744e5 [formerly 9892a1a262]
Former-commit-id: cbf9e42c21
2013-08-08 15:34:01 -04:00
David Gillingham
651ed92403 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: 6471edab78 [formerly 20e0f4b756] [formerly 6471edab78 [formerly 20e0f4b756] [formerly f839ef6f3b [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 5f9352cb65 [formerly 616c023369]
Former-commit-id: 6b03403d65
2013-08-08 09:41:33 -05:00
Nate Jensen
527da593d3 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 04e78d5a64 [formerly cdfea29b16] [formerly 04e78d5a64 [formerly cdfea29b16] [formerly 5c7dc36583 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]
Former-commit-id: 5c7dc36583
Former-commit-id: e99fd427ec [formerly d520081243]
Former-commit-id: f8bd55d407
2013-08-07 13:12:48 -05:00
Richard Peter
33d4f95c3e Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: 464352f731 [formerly 26df62db53] [formerly 464352f731 [formerly 26df62db53] [formerly f97a27796d [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]
Former-commit-id: f97a27796d
Former-commit-id: a67f0bf2da [formerly 3f1e17765a]
Former-commit-id: 5314b90720
2013-07-31 12:54:12 -05:00
Ron Anderson
e8ab3a860f Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: 4c61168660 [formerly 390f5b2439] [formerly 4c61168660 [formerly 390f5b2439] [formerly 47b977cdec [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]]
Former-commit-id: 47b977cdec
Former-commit-id: 17fef5a2ab [formerly 77e8cd467f]
Former-commit-id: e1a78db830
2013-07-31 09:00:07 -05:00
Bryan Kowal
03e6faba0f Issue #2164 - remove unnecessary junit dependency
Former-commit-id: 204fa65c8f [formerly a0f1944796] [formerly 204fa65c8f [formerly a0f1944796] [formerly 77473d75b5 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]
Former-commit-id: 77473d75b5
Former-commit-id: 02bba2ae9c [formerly 686affce01]
Former-commit-id: 892b3e6126
2013-07-29 16:31:15 -05:00
Greg Armendariz
89a582f766 Issue #2207 - Additional test fixes
Former-commit-id: 0f4595d842 [formerly afe9191fea] [formerly 0f4595d842 [formerly afe9191fea] [formerly b5d509fc4a [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]
Former-commit-id: b5d509fc4a
Former-commit-id: 599458dbb5 [formerly 56881355ed]
Former-commit-id: 06f3e23394
2013-07-26 09:24:43 -05:00
Steve Harris
767b7fdb4d 13.5.1-8 baseline
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
2013-07-26 09:02:34 -04:00
Nate Jensen
db3456c04d Merge "Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing" into development
Former-commit-id: 3958edbdae [formerly b7c4087765] [formerly 3958edbdae [formerly b7c4087765] [formerly 88c0b989ef [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]]
Former-commit-id: 88c0b989ef
Former-commit-id: 38501a83d5 [formerly a7cadf0388]
Former-commit-id: 1cc5422213
2013-07-25 16:04:22 -05:00
Nate Jensen
63ac241687 Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: 25b78917ff [formerly cf656dddc6] [formerly 25b78917ff [formerly cf656dddc6] [formerly d364cfe32e [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]]
Former-commit-id: d364cfe32e
Former-commit-id: f110fe5f6f [formerly dc7c2fd063]
Former-commit-id: 070fa38093
2013-07-25 14:59:01 -05:00
Ron Anderson
13e808b34d Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: d32f777957 [formerly cfa2d38a32] [formerly d32f777957 [formerly cfa2d38a32] [formerly a915cdab25 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]]
Former-commit-id: a915cdab25
Former-commit-id: a40cde69de [formerly 46d47d61e7]
Former-commit-id: 7c0b176b9d
2013-07-25 13:05:56 -05:00
David Gillingham
888a61c520 Issue #1762: Fix Service Backup regression caused by last commit under this
ticket: NullPointerException caused by missing DynamicSerialize annotation and
disabled export configuration option caused by incomplete request.

Former-commit-id: 9fa6048f38 [formerly 881566d46b] [formerly 9fa6048f38 [formerly 881566d46b] [formerly 938f9cd7f7 [formerly 071f7e80fc09720a3b1763d4903eb75fb96ebcca]]]
Former-commit-id: 938f9cd7f7
Former-commit-id: 72e808cb1c [formerly 42f096abe8]
Former-commit-id: 274ca5a740
2013-07-22 17:24:00 -05:00
David Gillingham
683298b43b Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 5bfa13b5bf [formerly cf21fb8fb3] [formerly 5bfa13b5bf [formerly cf21fb8fb3] [formerly 2281f4abc5 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]]
Former-commit-id: 2281f4abc5
Former-commit-id: c14ab8225f [formerly ea42ffa3e5]
Former-commit-id: 6b49330d25
2013-07-22 16:37:42 -05:00
Richard Peter
2a9cfe51af Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
2013-07-22 09:40:18 -05:00
David Gillingham
6415691028 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: 62d740b2ed [formerly 1fc7c3197a] [formerly 62d740b2ed [formerly 1fc7c3197a] [formerly d0568ff347 [formerly bf21f81dcad44880af5a3f988d15d4330b2b1d6b]]]
Former-commit-id: d0568ff347
Former-commit-id: 988a705e81 [formerly 4b9edbdcb4]
Former-commit-id: e52a6caa0e
2013-07-19 11:24:30 -05:00
Steve Harris
513c089375 13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
2013-07-18 12:07:22 -04:00
Max Schenkelberg
5ba50b4476 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 94fa6f0e30 [formerly 63421a4819] [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: d1881ffa51 [formerly 1610826d2e]
Former-commit-id: a47f187f4f
2013-07-15 14:26:15 -05:00
Greg Armendariz
13ac0b1062 13.5.1-5 baseline
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
2013-07-03 12:20:27 -04:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Richard Peter
ed15c2edcc Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: ad353c34f9 [formerly d262c02612] [formerly ad353c34f9 [formerly d262c02612] [formerly b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e03283ad4a [formerly af1099b3fb]
Former-commit-id: 8f49eea08f
2013-06-24 18:51:56 -05:00
Richard Peter
9acddf6eeb Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 0fa3bf800d [formerly 744eb64856] [formerly 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: be094a1745 [formerly a7594f8c93]
Former-commit-id: 4b582fef50
2013-06-24 18:36:15 -05:00
Steve Harris
50d4376af7 13.5.1-3 baseline
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: deebdb874a [formerly 810388f00a]
Former-commit-id: 1e939939b5
2013-06-24 09:29:43 -04:00
David Gillingham
d88ca5e0c4 Issue #2111: Prevent possible NullPointerException in GridCanvas's mouse
handler when attempting to display context menu.

Change-Id: I87fd5e790364028986e1a7872f4adf747b78bfee

Former-commit-id: 5490893942 [formerly 6b696c9e6a] [formerly 5490893942 [formerly 6b696c9e6a] [formerly 4f6c293a7e [formerly be9d6ed2d6c2a87afb5365abba0c9f09983550ec]]]
Former-commit-id: 4f6c293a7e
Former-commit-id: 2e14d2fda4 [formerly 8b7a998bbf]
Former-commit-id: 3a78e38ae5
2013-06-20 16:31:43 -05:00
Steve Harris
afc02d5731 13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
2013-06-17 15:01:22 -04:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Mike Duff
1fd24b44e2 Issue #1981 - OUPRequest is now a privileged request.
Also proctecting TafQueueRequest

Change-Id: I3a05a407a21b8f9d2e6426c4f456e2218479242a

Former-commit-id: 386cdeeba6 [formerly ee5e9c1435] [formerly 386cdeeba6 [formerly ee5e9c1435] [formerly 37cdcc0b0b [formerly acc1b993db8d78f7edfc3bd287b7d3ca39c0d391]]]
Former-commit-id: 37cdcc0b0b
Former-commit-id: a614c16aba [formerly c293c466c1]
Former-commit-id: add586bb26
2013-06-07 15:52:02 -05:00
Steve Harris
d46b0413fb 13.4.1-14 baseline
Former-commit-id: be236eb722 [formerly c749e122eb] [formerly be236eb722 [formerly c749e122eb] [formerly 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]]
Former-commit-id: 18b90226a2
Former-commit-id: cebc1ddb63 [formerly dee685e3c7]
Former-commit-id: 8ec7524cbb
2013-06-06 15:15:27 -04:00
Richard Peter
22f6319986 Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: f13177a981 [formerly 192e5b9be8] [formerly f13177a981 [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: 9c3fe01efa [formerly ae09db35ad]
Former-commit-id: 13f64a7da8
2013-06-04 14:06:53 -05:00
Matt Nash
2b85258c26 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: 7d61737d79 [formerly 7895dfa2e4] [formerly 7d61737d79 [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]
Former-commit-id: cb59b82add
Former-commit-id: c61b9d95e5 [formerly 5d492a4b10]
Former-commit-id: 0d06f59694
2013-06-03 09:58:43 -05:00
Ron Anderson
40b8d1ed3c Issue #2028 Fixed date line issue in MakeHazardDialog
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: 165bc6c409 [formerly 6557515f64] [formerly 165bc6c409 [formerly 6557515f64] [formerly 08e09382db [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 3f9cb35feb [formerly c3363d43fa]
Former-commit-id: b04716dd2b
2013-05-30 11:01:07 -05:00
Dustin Johnson
03cbf9a455 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 463bed7647 [formerly efc3c6a2f2] [formerly 463bed7647 [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 74d985af51 [formerly b1d66a0450]
Former-commit-id: 3dbb682493
2013-05-30 09:49:09 -05:00
Nate Jensen
e4bbe70d57 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
2013-05-29 14:49:43 -05:00
Steve Harris
61debd93bf Merge branch 'omaha_13.4.1' into development
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 389eefd1f9 [formerly 0f9e0b343d]
Former-commit-id: c184d31779
2013-05-22 16:13:08 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
2013-05-22 16:42:39 -04:00
Richard Peter
fb910196c0 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
2013-05-17 10:33:18 -05:00
Steve Harris
1730b6c41e 13.4.1-9 baseline
Former-commit-id: 88eee9cbfa [formerly bcf7f15c90] [formerly 88eee9cbfa [formerly bcf7f15c90] [formerly aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]
Former-commit-id: aff41713f9
Former-commit-id: 67a95d07d2 [formerly 0766ae20dd]
Former-commit-id: 3f87ea1a15
2013-05-16 11:12:07 -04:00
David Gillingham
7f956add77 Issue #1842: Use GetNextEtnRequest to handle ETN assignment for GFE VTEC
products.

Change-Id: Ice767da91252461fabf3fe8b5296e3d1e90a9c1d

Former-commit-id: 0cbf36df79 [formerly 9c688f7070] [formerly 0cbf36df79 [formerly 9c688f7070] [formerly 84158e76c7 [formerly 13d5d8dd7c59fcf399d62e83c9eb7021bca4c2d1]]]
Former-commit-id: 84158e76c7
Former-commit-id: 9f79748cd2 [formerly ca10ac1598]
Former-commit-id: fab4021ce4
2013-05-15 13:56:53 -05:00
Richard Peter
c7755a649b Merge branch 'omaha_13.4.1' (13.4.1-7) into development
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 2c009eb618 [formerly a12830f762] [formerly 2c009eb618 [formerly a12830f762] [formerly c5040038d3 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 6c09ab9bdf [formerly bcf4dcc810]
Former-commit-id: f7470fbd8f
2013-05-13 17:11:05 -05:00
Steve Harris
c7c6ea343e 13.4.1-7 baseline
Former-commit-id: 8072752c77 [formerly 4c6ff79e71] [formerly 8072752c77 [formerly 4c6ff79e71] [formerly 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]
Former-commit-id: 8347bed50e
Former-commit-id: ff7a21ac37 [formerly b35027f661]
Former-commit-id: dffa6d3bdc
2013-05-13 12:58:10 -04:00