Commit graph

1483 commits

Author SHA1 Message Date
Nate Jensen
33f185d021 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 4486bd9941 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]
Former-commit-id: 676b3c9d11
2013-03-12 16:43:13 -05:00
Nate Jensen
b00ccd2b77 Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]
Former-commit-id: cbf0343d72
2013-03-12 16:04:59 -05:00
Steve Harris
d5bcdb0015 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]
Former-commit-id: 0cd7e56e65
2013-03-12 16:04:23 -05:00
Dave Hladky
6ea95002de Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]
Former-commit-id: 4b08491880
2013-03-12 15:48:34 -05:00
Mike Duff
b5bccd0bb2 Issue #1760 - fix minutes on the y axis of 3 hour graph
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: 714de645d5 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]
Former-commit-id: 7040daf472
2013-03-12 11:25:05 -05:00
Lee Venable
e080fb5106 Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
Former-commit-id: d5af1f02c5 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]
Former-commit-id: 28d74d91b0
2013-03-12 09:08:44 -05:00
Mike Duff
caed059e23 Issue #1781 - Fix Hydro Time Series slow table loads
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 6a6844fdaf [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]
Former-commit-id: cac9bd6119
2013-03-12 09:03:08 -05:00
Steve Harris
4ed21b702b 13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 566b677d09
2013-03-12 08:35:45 -05:00
Roger Ferrel
334f2c4a57 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]
Former-commit-id: b421c97d86
2013-03-11 13:00:44 -05:00
Roger Ferrel
3684c7efed Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]
Former-commit-id: 9e8472bab6
2013-03-11 11:16:22 -05:00
Dave Hladky
73c21a6ead Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 2a854d7c30 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]
Former-commit-id: bb4c54eff0
2013-03-08 09:58:17 -06:00
Nate Jensen
d6c3c84d30 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]
Former-commit-id: 163f93019b
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
c2b021427b Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 8f70214f66 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]
Former-commit-id: 6a3281c878
2013-03-05 16:02:47 -06:00
Jonathan Sanchez
42bcef0be0 Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 1a91fe52e7 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]
Former-commit-id: 1f2db32448
2013-03-05 15:05:19 -06:00
Steve Harris
b9563da8a8 Merge branch 'omaha_13.3.1' into development
Former-commit-id: d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]
Former-commit-id: aa0e9acefd
2013-03-05 12:29:44 -06:00
Steve Harris
a8e1557c62 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]
Former-commit-id: 57f42761d7
2013-03-05 12:27:49 -06:00
Steve Harris
a40c9136fe 13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]
Former-commit-id: e26f7eb151
2013-03-05 10:47:06 -06:00
Steve Harris
5e55ded3a9 13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]
Former-commit-id: 2edca90902
2013-03-05 10:39:59 -06:00
Nate Jensen
e3db522be4 Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]
Former-commit-id: a952d48b3e
2013-03-05 09:10:52 -06:00
Richard Peter
180540eb47 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]
Former-commit-id: 784cd2145f
2013-03-04 17:48:05 -06:00
Dave Hladky
1260b40307 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]
Former-commit-id: fc36146f48
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
b16399cfdb Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]
Former-commit-id: c1c5ac7926
2013-03-04 16:47:11 -06:00
Dustin Johnson
c0a1ae396a Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]
Former-commit-id: 54c3980cba
2013-03-04 14:55:50 -06:00
Nate Jensen
aaac07f26c Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]
Former-commit-id: 773b39548d
2013-03-04 12:28:19 -06:00
Matt Nash
274becd212 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]
Former-commit-id: 1d25736871
2013-03-04 09:41:11 -06:00
Ron Anderson
78a8d8f1a1 Issue #1597 Provide valid default settings. Deploy gfe.xml config file.
Change-Id: Ic34e231a8f10ba55051b89f6081f081b402a01c8

Former-commit-id: fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]
Former-commit-id: e8f1b460ce
2013-03-04 09:30:04 -06:00
Richard Peter
94d804a301 Issue #1740: Baseline cave monitoring script
Former-commit-id: 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]
Former-commit-id: 783e9c1a25
2013-03-01 16:17:25 -06:00
Bryan Kowal
8fd24a3969 Issue #1638 - remove apache camel from the ncep feature. no plugin in the feature currently even imports
a package from apache camel

Change-Id: I88a91b8802d93e88b2fe66801ee336c3eb4bfd5a

Former-commit-id: 62e7cca531 [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]
Former-commit-id: bd7877a71e
2013-03-01 14:32:31 -06:00
Ben Steffensmeier
5a149c5dfa Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]
Former-commit-id: 9263ff1846
2013-03-01 11:03:11 -06:00
Nate Jensen
0d0dfb474f Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]
Former-commit-id: 302e851b67
2013-03-01 10:15:46 -06:00
Bryan Kowal
497bf33892 Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]
Former-commit-id: 4faf8aefbe
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
5068b18c6a Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]
Former-commit-id: 2ca86633d6
2013-02-28 17:00:56 -06:00
Ben Steffensmeier
453723dc9d Issue #1731 Allow ScanResource to work better with D2DTimeMatcher.
Former-commit-id: df38a21e11 [formerly 5909f8c7f9c89d3393a2ce6fd3dbf410c6d44c4b]
Former-commit-id: aaffde9bf5
2013-02-28 14:04:53 -06:00
Ben Steffensmeier
586438b393 Issue #1731 Remove unneccessary query in getDataStore.
Former-commit-id: 52a64eda01 [formerly e78a920afcf25b94d5ea473f96d548ce227ea435]
Former-commit-id: 38728f3073
2013-02-28 13:59:02 -06:00
Bryan Kowal
6a298318c5 Issue #1638 - fix the build; temporarily copy features that are not built until the build
is capable of resolving its own dependencies.

Change-Id: Id6f31f6428178bf2174079e53f32ca522eeaa445

Former-commit-id: 30f59c4bcc [formerly e2c597978c6559a4ef1d5eebb00328584745dae1]
Former-commit-id: 4f30dbb2b8
2013-02-28 10:02:40 -06:00
Max Schenkelberg
13a4056335 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]
Former-commit-id: 547c593dec
2013-02-27 16:19:58 -06:00
Richard Peter
c0e0a44e5f Merge "Issue #1597 Moved some interpolation messages to Performance Log for consistency." into omaha_13.3.1
Former-commit-id: 1ce1fb213b [formerly f4e326c44178ab01b6c5a7c4514dbdd5c9e00cba]
Former-commit-id: a9ffc8b170
2013-02-27 16:16:09 -06:00
Richard Peter
ba4a86de16 Merge "Issue #1659 Add time agnostic caching to grid derived parameters Change-Id: I59db267004a7acd51642c4360404e96d50378480" into omaha_13.3.1
Former-commit-id: 6535c1b6c7 [formerly ac6f072dbb19afe6dd76bfd368167ea60c2c8d00]
Former-commit-id: 656d9d74ae
2013-02-27 14:46:49 -06:00
Ron Anderson
a5195e137e Issue #1597 Moved some interpolation messages to Performance Log for consistency.
Change-Id: I1bd047ada89b0e9876549c6153d06c82e4dfc5c8

Former-commit-id: c9ca7a2943 [formerly 4683ff00b8bc515fc2f802810fc2caba37c282d8]
Former-commit-id: 079cdbcb29
2013-02-27 14:45:30 -06:00
Ben Steffensmeier
8112f669b3 Issue #1659 Add time agnostic caching to grid derived parameters
Change-Id: I59db267004a7acd51642c4360404e96d50378480

Former-commit-id: db1028ee7a [formerly 9685d0b363f21afbb42df02e9871884123d75e2c]
Former-commit-id: 6d85856e60
2013-02-27 12:37:14 -06:00
Ron Anderson
5bd0dbcfca Issue #1708 Clean up error handling for scripts with errors. Remove some verbose logging.
Change-Id: Ic05b985cf6cb79299fb55dc9eee4b3205ed3fb27

Former-commit-id: 36be1c5850 [formerly cb612d51394a261d12826d6d3ea9553f399ed2a9]
Former-commit-id: c35e06d82c
2013-02-27 12:34:40 -06:00
Max Schenkelberg
6b1426dd34 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]
Former-commit-id: e0ba97d547
2013-02-27 11:50:38 -06:00
Ron Anderson
84bd642290 Issue #1708 Fix redundant excution of evaluateQuery.
Change-Id: Ic41ac2b455755a59c189fa5ec0ca63b45bfca80a

Former-commit-id: a5a273c1c2 [formerly 2528719c05a9c57ca56a6d6e56ed3ae853d5b860]
Former-commit-id: 274ce762d8
2013-02-26 19:00:56 -06:00
Ron Anderson
77fbbb6a61 Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]
Former-commit-id: f37999b1eb
2013-02-26 18:44:51 -06:00
Dustin Johnson
cc0254ba03 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]
Former-commit-id: 88a9b953b6
2013-02-26 15:06:04 -06:00
Lee Venable
cb7fd87715 Merge "Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down" into development
Former-commit-id: 9cf3ca07b7 [formerly 26fa358838588643c003287d8125e58949c3648f]
Former-commit-id: 46ff81108a
2013-02-26 14:11:35 -06:00
Mike Duff
3071eb8456 Issue #1667 - Sort categories in the Stats Dialog's catgory drop-down
Change-Id: I92016564da48f7f736bebf58fdc0afca5cc1d9ff

Former-commit-id: b48e70fff4 [formerly 1d9c456b697a79f6093550a26cb3d2d4f972548d]
Former-commit-id: c77602652e
2013-02-26 14:03:55 -06:00
Nate Jensen
e1660e51f8 Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
Former-commit-id: 1e50b3a0e8 [formerly 698d1d88b5c67498046dcec558361797a01b07f5]
Former-commit-id: 4e60fa682d
2013-02-26 13:46:30 -06:00
Dustin Johnson
a7d4b23597 Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: 47cb278c01 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]
Former-commit-id: d31392d740
2013-02-26 13:41:46 -06:00
Dustin Johnson
b77ebdc924 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: fb38cceecd [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]
Former-commit-id: 76738dbf7d
2013-02-26 13:37:14 -06:00