Commit graph

3302 commits

Author SHA1 Message Date
Richard Peter
f97a27796d 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: d72693a1db1cd55392c7d171a67918e2bbe5daed
2013-07-31 12:54:12 -05:00
Richard Peter
85e1ff2f90 Merge "Issue #2180 encrypt credential storage" into development
Former-commit-id: ff2282377e18aee855e3029c82c6653cf3f4c9e5
2013-07-31 11:40:22 -05:00
Bryan Kowal
9b3f7977e5 Issue #2164 - fix 32-bit edex_com, edex_notify build
Change-Id: I04251c30fdba10d81940364056ba0f5478a56d30

Former-commit-id: a170ba8c71f1713f801ee663baf59ea4bd206afe
2013-07-31 11:34:00 -05:00
Richard Peter
317f1bc568 Merge "Issue #1051 Upgrade script for bufrmos invalid locations. Change-Id: I78b29e173654d0066852b650d4d791920fc07977" into development
Former-commit-id: f19ce489e7a0f3b671cb8a85cc445d48c6fc5f91
2013-07-30 21:34:54 -05:00
Richard Peter
618fabe94f Merge changes Ibb67b53b,I376f2970,Ie4dee73b into development
* changes:
  Issue #2227 Fix issue with swapping of melting layer product.
  Issue #1726 add swt to unit tests project for use when we need it
  Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes


Former-commit-id: a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8
2013-07-30 21:32:42 -05:00
Ben Steffensmeier
0a8543b6fa Issue #1051 Upgrade script for bufrmos invalid locations.
Change-Id: I78b29e173654d0066852b650d4d791920fc07977

Former-commit-id: ec3d2599a9c792be08ffdb67cb0de9330b37b04a
2013-07-30 17:08:28 -05:00
Bryan Kowal
894aeda688 Issue #2164 - re-enable the build of awips2-notification
Former-commit-id: 0c8b0a5d178b798b788a602b4053a864fa2f2286
2013-07-30 13:04:54 -05:00
Matt Nash
b308e86105 Issue #2227 Fix issue with swapping of melting layer product.
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d

Former-commit-id: fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02
2013-07-30 10:47:37 -05:00
Matt Nash
74faace462 Issue #1726 add swt to unit tests project for use when we need it
Change-Id: I376f297094b21613c32fdb20e751f6c14198188b

Former-commit-id: f58406d3f62a7aa2f3e7769662391590ee0de0ef
2013-07-30 09:13:18 -05:00
Matt Nash
8588f67264 Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes
Change-Id: Ie4dee73bdf63712f372b3067e59e0dbb499d6d5c

Former-commit-id: 518a93ba1830230e504b576ad35ffb9453a1817c
2013-07-30 09:05:31 -05:00
Ron Anderson
43b5d2193b Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
Former-commit-id: b286c654293e9b7bc11930953118b1d86da946dc
2013-07-30 08:35:06 -05:00
Dave Hladky
adf02a83c0 Issue #2180 encrypt credential storage
Change-Id: If617535df024216c8d089a67c326c098e906724e

Former-commit-id: f912ce7c2806abdce17c2b994d9226cdacf1ff34
2013-07-30 08:33:59 -05:00
Richard Peter
ac59471b45 Merge "Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade." into development
Former-commit-id: 1982de77f9dc752a442e4e82e84a958fef79d19d
2013-07-29 22:12:50 -05:00
Ron Anderson
4aceedceb5 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 0f490c934d197bc45fea1fad2c034c47a2556988
2013-07-29 18:12:24 -05:00
Ron Anderson
fd43f74212 Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development
Former-commit-id: 5188a208a6b66eb024db64efeb8a6409c57d4a64
2013-07-29 18:11:30 -05:00
Ron Anderson
f3a8ccf158 Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7
2013-07-29 17:19:07 -05:00
Bryan Kowal
77473d75b5 Issue #2164 - remove unnecessary junit dependency
Former-commit-id: 8e7229a41ec6b5816a27f86a37e5d183cd0d1925
2013-07-29 16:31:15 -05:00
Lee Venable
80a147990e Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development
Former-commit-id: 1f7a3d63a890934875a59a454e910bac94cdc671
2013-07-29 15:06:42 -05:00
Matt Nash
0c98b5e9de Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

Former-commit-id: 06fe93289dd6832fe7b2b78e6d15f15f229c2532
2013-07-29 14:47:19 -05:00
Bryan Kowal
a44a5d16e7 Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade.
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: e317a0d7101182ad351f604cfc04ad0292773161
2013-07-29 13:50:33 -05:00
Lee Venable
30baa25afa Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development
Former-commit-id: d49617f4acec37ddbaa0ec1d91306687a35531b0
2013-07-29 11:52:16 -05:00
Lee Venable
ccf6962224 Merge "Issue #2217 - Added better error handling" into development
Former-commit-id: 880308a45215aba37e9f6fa367f0848cdbb0da51
2013-07-29 11:44:59 -05:00
Richard Peter
450af19c9c Merge "Issue #1051 Discard bufrmos data with invalid location." into development
Former-commit-id: 15e7809ca7503415ba0603cc39e7f0543d1e5af1
2013-07-29 11:12:19 -05:00
Richard Peter
736c88ae6c Merge "Issue #2231 Make edex startup more configurable" into development
Former-commit-id: da8f06eeb0bb2b68047896547d0181bdb0e82928
2013-07-29 10:14:58 -05:00
Mike Duff
3ab275aea4 Issue #2232 - Fix index out of bounds exception in Sub Manager Table
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

Former-commit-id: baa8d402efb4aeff839e06fd180a73a857fd0766
2013-07-29 09:55:51 -05:00
Ben Steffensmeier
a5112b6e19 Issue #1051 Discard bufrmos data with invalid location.
Former-commit-id: 17c5060c2cb1101d93550904fec3f59704838ff1
2013-07-26 17:42:06 -05:00
Richard Peter
8ba840f1d9 Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: 8a8eff74685abb8a709480fa33f2c56dd7923ab9
2013-07-26 14:36:46 -05:00
Richard Peter
196f5f4a5d Merge "Issue #2189 Set size properly on GLFont" into development
Former-commit-id: 7f7762b889e7b86231f22abb89dd94d630c0d291
2013-07-26 14:34:46 -05:00
Max Schenkelberg
564d6ee664 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: 77d6ace9b601558ece1bf5ea724ef2f08df0112a
2013-07-26 13:14:48 -05:00
Richard Peter
c57aa39ddd Merge "Issue #2112 Fix volume browser sounding errors." into development
Former-commit-id: 019b1d63f11c9d1d57593e26f939d6b089730693
2013-07-26 10:23:08 -05:00
Greg Armendariz
17b8376a72 Issue #2207 - fix build issues with ncep unit-test directories
Former-commit-id: 766c2983afc0aac22143f86afa0c5eca500d1941
2013-07-26 09:48:44 -05:00
Greg Armendariz
b5d509fc4a Issue #2207 - Additional test fixes
Former-commit-id: 38531ca3d8336801663d7d664d0578497dff8911
2013-07-26 09:24:43 -05:00
Greg Armendariz
66caca12a4 Merge "Issue #2207 - Remove reference to missing tests directory" into development
Former-commit-id: 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724
2013-07-26 09:05:53 -05:00
Greg Armendariz
f3d82d8e82 Issue #2207 - Remove reference to missing tests directory
Former-commit-id: 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c
2013-07-26 08:59:41 -05:00
Lee Venable
4635a88d54 Merge "Issue #2218 - improve error handling and performance in SCANMonitor" into development
Former-commit-id: bfbe879b22697ca7c8558ee94c49137a7787cfc9
2013-07-26 08:48:56 -05:00
Greg Armendariz
578c307d40 Issue #2207 - Fix build
Former-commit-id: 86ca9354e8800acd2f15633e0f44980627a0359f
2013-07-26 08:44:52 -05:00
Nate Jensen
1c765670ea Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 49299504331c730ffe8a94f490f88337baf12233
2013-07-26 08:43:29 -05:00
Steve Harris
804270e3a2 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 5fca4065166ffd0e1d7a21f8463abd30657307b9
2013-07-26 08:28:54 -05:00
Steve Harris
dfbf9a5afe 13.5.1-8 baseline
Former-commit-id: 37504305d70e6aaf6a7bdfad8267054af0612515
2013-07-26 09:02:34 -04:00
Ron Anderson
668cbd0c87 Merge "Issue #2044 Fix topo retrieval in ifpnetCDF" into development
Former-commit-id: 50129c57d6cc798da0dcf6b5f9b84811af5f6fa1
2013-07-25 18:17:08 -05:00
Ron Anderson
f6f19065e6 Issue #2044 Fix topo retrieval in ifpnetCDF
Change-Id: I3e15f9ed8a5e7577332fade9cfabeb9734fd1d20

Former-commit-id: 9bacbf50094476cfb01be5b9ae1f535ca4afd1c9
2013-07-25 18:14:38 -05:00
Ben Steffensmeier
2680d6ddbc Issue #2112 Fix volume browser sounding errors.
Former-commit-id: f2999e84c430e98a4f1a4a1808b61d6810dac463
2013-07-25 17:58:49 -05:00
Nate Jensen
4ccfc5be82 Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: ae869b69c5a648205d4d0cd7275b4a6c1e82054d
2013-07-25 16:48:18 -05:00
Nate Jensen
88c0b989ef 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: 6db335a5fda51c1d501e7a5d6b1fc58eba77160a
2013-07-25 16:04:22 -05:00
Nate Jensen
d364cfe32e 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: a53ff5142d15461a595adb8a6e8d6b96aee3a878
2013-07-25 14:59:01 -05:00
Ron Anderson
0428b8fb7b Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: 3720bf498346073343d0dff7a6949d3f7f0d5f62
2013-07-25 13:59:17 -05:00
Richard Peter
89823b3681 Merge "Issue #2176 Implemented emergency warning products." into development
Former-commit-id: 717a1f81ecc323e4e1cc10e923956befb99e3e04
2013-07-25 13:54:48 -05:00
Jonathan Sanchez
67ce90c14a Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: 36df6339cc00afc5935746a4a47b0e9e8c641f85
2013-07-25 13:47:44 -05:00
Nate Jensen
21261b1d2f Merge "Issue #2208 moving ncep unit tests to tests project" into development
Former-commit-id: a7a6e14f62c7f17808330ea464129dabbe6d1afb
2013-07-25 13:46:39 -05:00
Nate Jensen
d7be59a97e Issue #2208 moving ncep unit tests to tests project
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

Former-commit-id: b027914534dc808a616e2b5b2ee55ed3dd304b2e
2013-07-25 13:28:27 -05:00