Commit graph

2135 commits

Author SHA1 Message Date
Nate Jensen
84ea117d75 Issue #1638 fix build
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e

Former-commit-id: 1cbc7bbfdc [formerly 192fe9a724 [formerly fe7a28034739ec871528f041cfa7a488e5c71378]]
Former-commit-id: 192fe9a724
Former-commit-id: 975d044ba6
2013-03-13 08:50:26 -05:00
Nate Jensen
48170212cb Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: cbf0343d72 [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: 863d4cf3df
Former-commit-id: 5e545cc9c4
2013-03-12 16:04:59 -05:00
Dustin Johnson
f417e8fc5d Merge "Issue #1778 Watch for bandwidth configuration changes" into development
Former-commit-id: 6a0a04a519 [formerly 11e7d3b511 [formerly f33c6cbe9c63721ec62f57b3953abd48729c8674]]
Former-commit-id: 11e7d3b511
Former-commit-id: 13ce9b683d
2013-03-12 12:15:50 -05:00
Dustin Johnson
e358952f1f Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: 794812fb23 [formerly 4c7f7801fa [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]
Former-commit-id: 4c7f7801fa
Former-commit-id: 6eed493b3e
2013-03-12 12:02:09 -05:00
Lee Venable
ac7a1d3ea6 Merge "Issue #1760 - fix minutes on the y axis of 3 hour graph" into development
Former-commit-id: d68b5ac543 [formerly c4c8d74cad [formerly 85970efae8002eb3f1773942211bd202014fecf2]]
Former-commit-id: c4c8d74cad
Former-commit-id: 1285a3d4af
2013-03-12 11:33:17 -05:00
Mike Duff
f5d8ba8b0f Issue #1760 - fix minutes on the y axis of 3 hour graph
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: 7040daf472 [formerly 714de645d5 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]
Former-commit-id: 714de645d5
Former-commit-id: a6eea1874b
2013-03-12 11:25:05 -05:00
Mike Duff
6f79d5e8f9 Issue #1646 - Format the output
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6

Former-commit-id: ec0d814aa6 [formerly d1d694e1db [formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]
Former-commit-id: d1d694e1db
Former-commit-id: 75b6040ff6
2013-03-12 10:42:13 -05:00
Roger Ferrel
c0ee394e9c 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: 9e8472bab6 [formerly 6744238fce [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 6744238fce
Former-commit-id: a73687c1b8
2013-03-11 11:16:22 -05:00
David Gillingham
d10e4ea50b Issue #1759: Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
GfeScriptExecutor and GfeScript.

Change-Id: If3c789549a071e54f9020433f6221e688c51c44a

Former-commit-id: 1518c0b53c [formerly 4459ecfa78 [formerly a3918b30452a829a8f0cd562021959246bf1144a]]
Former-commit-id: 4459ecfa78
Former-commit-id: 6b695c6a5e
2013-03-07 17:25:14 -06:00
Dustin Johnson
1b06171fe2 Issue #1647 Write out data targeted for the SBN as hidden, then rename
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e

Former-commit-id: 2a6edae82b [formerly 959e7e39d3 [formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]
Former-commit-id: 959e7e39d3
Former-commit-id: 84642b4f33
2013-03-07 14:39:34 -06:00
Lee Venable
90856bb929 Merge "Issue #1600 Created a utility class for adjust angles." into development
Former-commit-id: 1854e71f8a [formerly 3929ef49cd [formerly 52672b8ce9f9f28f707f7f6c1cd7ff61845ab752]]
Former-commit-id: 3929ef49cd
Former-commit-id: 06462c5706
2013-03-05 15:37:18 -06:00
Jonathan Sanchez
f79907bf9f Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 1f2db32448 [formerly 1a91fe52e7 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]
Former-commit-id: 1a91fe52e7
Former-commit-id: 3fface264c
2013-03-05 15:05:19 -06:00
Dustin Johnson
d12fad8225 Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
Former-commit-id: 90b18cc477 [formerly 2262872d2d [formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]
Former-commit-id: 2262872d2d
Former-commit-id: def94b337f
2013-03-05 15:01:02 -06:00
Steve Harris
afd934db35 Merge branch 'omaha_13.3.1' into development
Former-commit-id: aa0e9acefd [formerly d5b80f9225 [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: d5b80f9225
Former-commit-id: 6b13492420
2013-03-05 12:29:44 -06:00
Steve Harris
3ec20c1689 Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
2013-03-05 12:27:49 -06:00
Richard Peter
23075edfa7 Merge "Issue #1750 - edexBridge will now set the QPID persistence flag" into development
Former-commit-id: 993f4ff2bd [formerly a44ee67d00 [formerly 8a29ff0890d07e02623e67dacd08d506c7c85d3a]]
Former-commit-id: a44ee67d00
Former-commit-id: a077fe35b5
2013-03-05 12:10:31 -06:00
Dustin Johnson
9cbd54fb43 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 547780f9a3 [formerly 8107f76d98 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]
Former-commit-id: 8107f76d98
Former-commit-id: 2bd62ad4b6
2013-03-05 11:39:42 -06:00
Steve Harris
e4a1c61ad5 13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
2013-03-05 10:47:06 -06:00
Steve Harris
9066d511fe 13.3.1-4 baseline
Former-commit-id: 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
2013-03-05 10:39:59 -06:00
Nate Jensen
d7bc5750ae Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1
Former-commit-id: a952d48b3e [formerly b803ae3801 [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: b803ae3801
Former-commit-id: b393674ef3
2013-03-05 09:10:52 -06:00
Nate Jensen
68716aedc0 Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
Former-commit-id: 8d44b9ea05 [formerly 75d959f536 [formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]
Former-commit-id: 75d959f536
Former-commit-id: c21079cc06
2013-03-05 09:10:31 -06:00
Dustin Johnson
14db0ef448 Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
Former-commit-id: ef632b7bfa [formerly c6137e89e7 [formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]
Former-commit-id: c6137e89e7
Former-commit-id: 9a6b647989
2013-03-05 08:53:09 -06:00
Bryan Kowal
b407a34461 Issue #1750 - edexBridge will now set the QPID persistence flag
Change-Id: I84132466da523b7ce193cdd38adef85c76828a98

Former-commit-id: 8b4dce1c3d [formerly 3a8efd5edf [formerly d466b647d0d810418a88c875f39e55d98d680aa1]]
Former-commit-id: 3a8efd5edf
Former-commit-id: d484acbca0
2013-03-04 17:58:04 -06:00
Richard Peter
3cc3648b9b Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 070f62d08e
Former-commit-id: e74f6074e7
2013-03-04 17:48:05 -06:00
Dave Hladky
d0cfd09209 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: 680317d9c4
Former-commit-id: 22ebfe0ecb
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
9a8b585720 Issue #1628 move xmx settings to linux so windows can override.
Former-commit-id: c1c5ac7926 [formerly fad56e32cc [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]
Former-commit-id: fad56e32cc
Former-commit-id: 5a88604ed6
2013-03-04 16:47:11 -06:00
Bryan Kowal
7434229e35 Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a

Former-commit-id: cd08f88c43 [formerly 862f97a19b [formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]
Former-commit-id: 862f97a19b
Former-commit-id: eb4d75de7f
2013-03-04 15:52:07 -06:00
Dustin Johnson
7bfc28b6f8 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: 54c3980cba [formerly 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]]
Former-commit-id: 1161125c84
Former-commit-id: 73f884753a
2013-03-04 14:55:50 -06:00
Steve Harris
f14f5aeb48 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].


Former-commit-id: fcb48a7280 [formerly 28391884a7 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: 28391884a7
Former-commit-id: 7ffb42d6e6
2013-03-04 13:03:19 -06:00
Steve Harris
702cec08bd Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]].


Former-commit-id: bba410a330 [formerly 88e633934d [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]
Former-commit-id: 88e633934d
Former-commit-id: 870972fb90
2013-03-04 13:02:32 -06:00
Nate Jensen
f832e5949c Merge "Issue #1476 make fix for collaboration for issues with closing of views when detached" into omaha_13.3.1
Former-commit-id: 773b39548d [formerly 0542f04538 [formerly 7a12fe5a93f52a476db81e0a1fd3beec8ea62023]]
Former-commit-id: 0542f04538
Former-commit-id: 5d772a2228
2013-03-04 12:28:19 -06:00
Dustin Johnson
446e86bd19 Issue #1647 Configure NCF and WFO retrieval tasks
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4

Former-commit-id: bf9eefe961 [formerly de7f387248 [formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]
Former-commit-id: de7f387248
Former-commit-id: 527ed01fec
2013-03-04 10:22:16 -06:00
Matt Nash
999413b2e7 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

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

Former-commit-id: e8f1b460ce [formerly fdeb45705b [formerly 53a924067c39e7f92b2f3280acf2cb6d15e2af03]]
Former-commit-id: fdeb45705b
Former-commit-id: f1d5ff7c9e
2013-03-04 09:30:04 -06:00
Dustin Johnson
16a942b446 Issue #1644 Remove SWT jars from Eclipse tests project classpath
Change-Id: I50e48c5119fc05f49db8ed8cdb477f373b9c1242

Former-commit-id: 357b968ae1 [formerly 3436c86641 [formerly 492688be79bd2ddbffee25e0baa256c23cc766eb]]
Former-commit-id: 3436c86641
Former-commit-id: af245e134e
2013-03-04 09:28:53 -06:00
Richard Peter
e54d4ba855 Issue #1740: Baseline cave monitoring script
Former-commit-id: 783e9c1a25 [formerly 163fb343de [formerly e391ad91d1b3ed98d986457642f8ad731de2f7c9]]
Former-commit-id: 163fb343de
Former-commit-id: 1632bd2882
2013-03-01 16:17:25 -06:00
Bryan Kowal
99ffceb3e4 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: bd7877a71e [formerly 62e7cca531 [formerly e1bef5abe061a7dd550dc8e38318b275e6653470]]
Former-commit-id: 62e7cca531
Former-commit-id: ec2ca3f1f1
2013-03-01 14:32:31 -06:00
Nate Jensen
64d504df91 Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 677908868e [formerly a90a2fe857 [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]
Former-commit-id: a90a2fe857
Former-commit-id: 6bf2eefa2a
2013-03-01 13:43:50 -06:00
Bryan Kowal
18a778cb8c Issue #1739 - fix Wes2Bridge
Change-Id: Idf557cb11d9a3314021536e9537afaf33a589814

Former-commit-id: 86a1f16e37 [formerly 20d3c6bcaa [formerly b74410b2e816686ed9525e3e8a80c17096e6aadb]]
Former-commit-id: 20d3c6bcaa
Former-commit-id: 9022c53d53
2013-03-01 11:49:09 -06:00
David Gillingham
e2a7d7a350 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: 9351f33c1c [formerly 50744c1f92 [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 50744c1f92
Former-commit-id: ca81ae4a71
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
f505cda0bf Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 86b9a4d8c2
Former-commit-id: b0870c55f6
2013-03-01 11:03:11 -06:00
Richard Peter
7408f18a45 Merge "Issue #1744 actually fix deadlock this time" into omaha_13.3.1
Former-commit-id: c50e1cbe1c [formerly 1754861897 [formerly 7eafcb1e677fafadc039a5106f296dbee1245136]]
Former-commit-id: 1754861897
Former-commit-id: f2ae906f93
2013-03-01 10:50:33 -06:00
Nate Jensen
eefa0d8e87 Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]
Former-commit-id: 8c84bc5fbb
Former-commit-id: 3dc69632c1
2013-03-01 10:48:03 -06:00
Richard Peter
75f91d596e Merge "Issue #1744 fix deadlock" into omaha_13.3.1
Former-commit-id: 7dcc007bee [formerly 79c70dacbd [formerly 6fbc789e08a5e6baf7ae6ff1348e1e2c5709c422]]
Former-commit-id: 79c70dacbd
Former-commit-id: ee1b0df106
2013-03-01 10:27:36 -06:00
Bryan Kowal
ed498a3b53 Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78

Former-commit-id: 44215e65e9 [formerly 5138fe5537 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]]
Former-commit-id: 5138fe5537
Former-commit-id: 29e157d94e
2013-03-01 10:26:25 -06:00
Nate Jensen
4f9f0c29d2 Merge "Issue #1731 Remove unneccessary query in getDataStore." into omaha_13.3.1
Former-commit-id: 302e851b67 [formerly d695473b0f [formerly 94e54241b7e85c523e019603cd9e815c179dc584]]
Former-commit-id: d695473b0f
Former-commit-id: 308de6885f
2013-03-01 10:15:46 -06:00
Nate Jensen
394a96db44 Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]
Former-commit-id: 2a575a24e7
Former-commit-id: e2f12d16b7
2013-03-01 10:12:56 -06:00
Bryan Kowal
875c17399a 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: 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: d081a2afcd
Former-commit-id: f806c880d3
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
8e2333d0d7 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: f46686a6e2
Former-commit-id: d27d30c2db
2013-02-28 17:00:56 -06:00
Dustin Johnson
bd70b0d8f3 Merge "Issue #1673: Moved data delivery specific files from minDB configuration where possible" into development
Former-commit-id: 59212a8241 [formerly 44140d1e0f [formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]
Former-commit-id: 44140d1e0f
Former-commit-id: 64cfd1c51d
2013-02-28 16:24:21 -06:00