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

652 commits

Author SHA1 Message Date
Steve Harris
a11c8dff6d Merge branch '13.2.1_delivery' into development 
Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]]
Former-commit-id: 5ee47e098d
Former-commit-id: b119d66cda [formerly 3ad515e28f]
Former-commit-id: d73efe8e86
 2013-02-06 11:12:01 -06:00
Steve Harris
f997ecea38 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]]
Former-commit-id: 6c6b53679b
Former-commit-id: 48a0ffda4d [formerly 28ddc9bad8]
Former-commit-id: f028c16f79
 2013-02-06 11:08:53 -06:00
Steve Harris
f36867a520 13.2.1-5 baseline 
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]]
Former-commit-id: 146fcc6da8
Former-commit-id: 7497a15e22 [formerly 1c602ec3a7]
Former-commit-id: bb0759d5ad
 2013-02-06 11:02:32 -06:00
Nate Jensen
5004f1a551 Merge "Issue #1553 initial implementation of radar factory Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574" into development 
Former-commit-id: 3f2aa931db [formerly ad4d5d6816] [formerly 3f2aa931db [formerly ad4d5d6816] [formerly 86c14f8275 [formerly a2c55643fe41a58029089aec2689a4678e7f8f6d]]]
Former-commit-id: 86c14f8275
Former-commit-id: 36810f3daa [formerly 7304e763d6]
Former-commit-id: dbc0a5137b
 2013-02-05 17:37:29 -06:00
Lee Venable
f82afa483c Merge "Issue #1550 - Add ability for MPE to preload maps on perspective open." into development 
Former-commit-id: 6e7f552972 [formerly 42941bb2be] [formerly 6e7f552972 [formerly 42941bb2be] [formerly cc34190c18 [formerly 07a61258f12fe6cf793467af271d060882953adc]]]
Former-commit-id: cc34190c18
Former-commit-id: 3444c01cfa [formerly 0dd325ed88]
Former-commit-id: b807d9085e
 2013-02-05 16:22:30 -06:00
Mike Duff
320c4c7683 Issue #1580 - Fix spring config 
Former-commit-id: 3f3554a559 [formerly 6b51c66923] [formerly 3f3554a559 [formerly 6b51c66923] [formerly 65deb06061 [formerly 020c39ec162e786ebb8b5a9a2feac7ae415e5036]]]
Former-commit-id: 65deb06061
Former-commit-id: 1fc97f07fe [formerly 62e25af348]
Former-commit-id: cc384772b7
 2013-02-05 15:49:22 -06:00
Mike Duff
28e854de25 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX. 
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 06ddb6cce7 [formerly 1b1d00f8a9] [formerly 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]]]
Former-commit-id: 36909dd6c0
Former-commit-id: cd52a94032 [formerly 4400265394]
Former-commit-id: 0cb979038b
 2013-02-05 15:13:51 -06:00
Dustin Johnson
01bfa884e5 Merge "Issue #1543 Break apart the retrieval process to support SBN capabilities. Made interfaces for various aspects of retrieval that are Spring injectable. Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept." into development 
Former-commit-id: 9da65d97bc [formerly 39cfcf40a8] [formerly 9da65d97bc [formerly 39cfcf40a8] [formerly 6f95400d1c [formerly b6c403f6c8e22397d1df178ffddc9b8951f7e683]]]
Former-commit-id: 6f95400d1c
Former-commit-id: 4fecb5f6a7 [formerly 2f900fb18f]
Former-commit-id: 0552073c4b
 2013-02-05 14:36:12 -06:00
Bryan Kowal
2afa604676 Issue #1577 - deploy-install and AWIPS II ant task updates 
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 81da18f851 [formerly 7815b651bb] [formerly 81da18f851 [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: efe288c82c [formerly 99994d3151]
Former-commit-id: 2fafc6a34b
 2013-02-05 13:25:15 -06:00
Dave Hladky
d8ce48e79d Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency 
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 7b49430e34 [formerly c0712160d7] [formerly 7b49430e34 [formerly c0712160d7] [formerly 7af5aab08a [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]]
Former-commit-id: 7af5aab08a
Former-commit-id: b134741e4c [formerly f6bd4ea0fa]
Former-commit-id: 69477ec246
 2013-02-05 12:23:56 -06:00
Richard Peter
916d24b076 Merge "Issue #1517 Added SPC Prob menu changes." into development 
Former-commit-id: e4894a01fd [formerly 74b3cc23ff] [formerly e4894a01fd [formerly 74b3cc23ff] [formerly 4170ba9558 [formerly 153173d6f07aaf135be6e5422c893942deef5371]]]
Former-commit-id: 4170ba9558
Former-commit-id: 501e305a66 [formerly a0807f8ecb]
Former-commit-id: a64802277e
 2013-02-05 09:23:20 -06:00
Steve Harris
8c01240531 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 9595fefb4b [formerly d997d99f05] [formerly 9595fefb4b [formerly d997d99f05] [formerly f380667b34 [formerly 815e8b741b173044f8f20f537674d685b50ed6af]]]
Former-commit-id: f380667b34
Former-commit-id: 24ff063657 [formerly 930f1f13c0]
Former-commit-id: 8470638469
 2013-02-04 15:26:44 -06:00
Bryan Kowal
0a74b80f23 Issue #1553 - remove duplicated "image" plugin 
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e

Former-commit-id: af697a65d1 [formerly 1b7e268feb] [formerly af697a65d1 [formerly 1b7e268feb] [formerly dd6abb0ba1 [formerly a16493410bddeca8982140a3a41922d46ee479b4]]]
Former-commit-id: dd6abb0ba1
Former-commit-id: 32012b9f64 [formerly 7bb3bef057]
Former-commit-id: 45f67cda75
 2013-02-04 13:07:35 -06:00
Nate Jensen
7bbb39b569 Issue #1553 fix build 
Change-Id: Ia716b2bd6ecd3c8e045ad91c4c3ca063690b91c3

Former-commit-id: f044441759 [formerly ea6dec5db8] [formerly f044441759 [formerly ea6dec5db8] [formerly dd854cdb85 [formerly d46cda9c95a94572fa2e6c89ed4298a55cf76e15]]]
Former-commit-id: dd854cdb85
Former-commit-id: 53bf879c83 [formerly d15a57427e]
Former-commit-id: 77a1ecc998
 2013-02-04 09:34:40 -06:00
Dustin Johnson
55f7212a0e Issue #1543 Break apart the retrieval process to support SBN capabilities. 
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.

Amend:
  Check whether debug is enabled prior to debug message.
  Move log of request xml inside null check.

Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc

Former-commit-id: cf063000ca [formerly 3b20efeb7d] [formerly cf063000ca [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 2940a059d1 [formerly b5f69e21d8]
Former-commit-id: bef0f2eca1
 2013-02-04 09:00:33 -06:00
Brad Gonzales
7253bbf20e Issue #1517 Added SPC Prob menu changes. 
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 35cc853c74 [formerly f459554e33] [formerly 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd [formerly f3ef309293]
Former-commit-id: adbfa7ced1
 2013-02-04 08:52:33 -06:00
Ben Steffensmeier
34cd58356e Issue #1553 initial implementation of radar factory 
Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574

Former-commit-id: efc647e6ba [formerly ed60f1a696] [formerly efc647e6ba [formerly ed60f1a696] [formerly 0eb24c11e2 [formerly 1db5404b22544dbc8954825121217c0ffce95fa0]]]
Former-commit-id: 0eb24c11e2
Former-commit-id: 8cbde9ef7d [formerly 681b30b3d8]
Former-commit-id: 1d7df3e6c1
 2013-02-01 16:29:13 -06:00
Nate Jensen
9837ce9241 Merge "Issue #1553 move radar units into common plugin for use in data access factory Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f" into development 
Former-commit-id: d7677be8a4 [formerly f77a1dc85c] [formerly d7677be8a4 [formerly f77a1dc85c] [formerly e1166c246c [formerly 358b990e43d0f5952ee3c33521778541bd1b7c04]]]
Former-commit-id: e1166c246c
Former-commit-id: d996064b91 [formerly 3ab7c693de]
Former-commit-id: 029b031536
 2013-02-01 15:01:24 -06:00
Ben Steffensmeier
04e0c7ca48 Issue #1553 fix RenderableTileSet for round projections. 
Former-commit-id: f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f3aa9d3ba4 [formerly 1e6d6ac799] [formerly f31215a999 [formerly 8bd997f193b4a8cc75fc6609b321b29f2524c08b]]]
Former-commit-id: f31215a999
Former-commit-id: 90070b40d2 [formerly 8c3deb1a93]
Former-commit-id: 77463bf7fa
 2013-01-31 17:17:30 -06:00
Ben Steffensmeier
2334bfef69 Issue #1553 move radar units into common plugin for use in data access factory 
Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f

Former-commit-id: e9d3c547ff [formerly 057654103d] [formerly e9d3c547ff [formerly 057654103d] [formerly 54d91281a6 [formerly c9faa8b98ce3687667363841f5955d8aebab6b1e]]]
Former-commit-id: 54d91281a6
Former-commit-id: df823559eb [formerly 8442c27bc6]
Former-commit-id: bbdd86c866
 2013-01-31 17:15:11 -06:00
Steve Harris
e32a6d6364 Merge branch '13.2.1_delivery' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into 13.2.1_delivery 
Former-commit-id: e173b1caf7 [formerly 2117c3905f] [formerly e173b1caf7 [formerly 2117c3905f] [formerly 5966741649 [formerly 3008b5145d81fd940bed26cf96bfeaa42505e830]]]
Former-commit-id: 5966741649
Former-commit-id: c5dce3cc06 [formerly 8a2ee0ce90]
Former-commit-id: bacc980b63
 2013-01-31 16:20:45 -06:00
Jonathan Sanchez
0f441e63c7 Issue #1557 Added allowDuplicates XML element to point source configuration. 
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: b2870a012e [formerly da1061baa6] [formerly b2870a012e [formerly da1061baa6] [formerly f72968824a [formerly 945b2e64b971fc31691d550e6c629f43db9a9c99]]]
Former-commit-id: f72968824a
Former-commit-id: ed42a6d939 [formerly 53eddc3ec8]
Former-commit-id: aec55e410f
 2013-01-31 16:01:04 -06:00
Lee Venable
57443eb443 Merge "Issue #1557 Added allowDuplicates XML element to point source configuration. Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b" into development 
Former-commit-id: bc4b462c69 [formerly 3cc2665f41] [formerly bc4b462c69 [formerly 3cc2665f41] [formerly f2e7f7ff1b [formerly a7e3ea831a4cbd3e5ab04f3288b8eac8f74f70f3]]]
Former-commit-id: f2e7f7ff1b
Former-commit-id: f192004c51 [formerly 16bc40cec8]
Former-commit-id: f5919fdf64
 2013-01-31 15:54:05 -06:00
Bryan Kowal
fa38db1d45 Merge "Issue #1551 - adding maps to the Data Access Framework" into development 
Former-commit-id: 776e7ab5c2 [formerly f585de398b] [formerly 776e7ab5c2 [formerly f585de398b] [formerly 73cf3ac730 [formerly d722b34158a74e922025804a2f0953226aae7a98]]]
Former-commit-id: 73cf3ac730
Former-commit-id: 6027369645 [formerly a65ccede20]
Former-commit-id: 59cbe4be3f
 2013-01-31 15:24:30 -06:00
Jonathan Sanchez
db72c21e73 Issue #1557 Added allowDuplicates XML element to point source configuration. 
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

Former-commit-id: c6a47fe8c9 [formerly 55b12dae25] [formerly c6a47fe8c9 [formerly 55b12dae25] [formerly ed0bce744e [formerly 9ba75c5a838b95ff09a64929c97492b97f4729f1]]]
Former-commit-id: ed0bce744e
Former-commit-id: 8d3188713b [formerly c8b8981804]
Former-commit-id: e3d4a66310
 2013-01-31 15:11:17 -06:00
Benjamin Phillippe
c72a037691 Issue #1525 Data Discovery Browser Performance 
Change-Id: I1b5405e52fa8462b562e8a56b2e544d96e9ad0f3

Former-commit-id: 25b05eada7 [formerly acb6889b1d] [formerly 25b05eada7 [formerly acb6889b1d] [formerly 9806387a8b [formerly 495a30e31a16f0c595c35555e4d804585dcb5a96]]]
Former-commit-id: 9806387a8b
Former-commit-id: d68bb6da0d [formerly db40c02bbf]
Former-commit-id: 182df430f4
 2013-01-31 14:43:26 -06:00
Steve Harris
2107a54161 Merge branch '13.2.1_delivery' into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: c218786986 [formerly 658bea377b] [formerly c218786986 [formerly 658bea377b] [formerly ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 73d9455c65 [formerly 6383bf8ed2]
Former-commit-id: a74d58ce6f
 2013-01-31 10:19:14 -06:00
Bryan Kowal
df8f224bde Issue #1551 - adding maps to the Data Access Framework 
- initial commit of Maps Geometry Factory
- re-factored geometry factory code
- addressing peer review comments
- cast to Timestamp

Change-Id: Ie12177b5ae1a8d8d9151d061682730841cfcc807

Former-commit-id: 6ea0653c78 [formerly 964b30d5f2] [formerly 6ea0653c78 [formerly 964b30d5f2] [formerly 5d83f9f3d1 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 0557ecfed3 [formerly e86fda2a6f]
Former-commit-id: c4e18dd6e6
 2013-01-31 10:03:10 -06:00
Dustin Johnson
ba39807ebe Issue #1501 Fix broken required latency calculations 
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: e64e36ecf2 [formerly f361f5a6a1] [formerly e64e36ecf2 [formerly f361f5a6a1] [formerly 5830a98a51 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]
Former-commit-id: 5830a98a51
Former-commit-id: 0185add187 [formerly d7077690d8]
Former-commit-id: 74f27ce9f8
 2013-01-31 08:39:08 -06:00
Nate Jensen
c45484d7d9 Merge "Issue #1521 add extra validation and checks to grid factory Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c" into development 
Former-commit-id: f1cf8bff45 [formerly 88b52e25f2] [formerly f1cf8bff45 [formerly 88b52e25f2] [formerly b765544b40 [formerly af723dd7ec322d586b7eb48381105c1043f32e67]]]
Former-commit-id: b765544b40
Former-commit-id: 2db9dc1130 [formerly 8952df8497]
Former-commit-id: fc60602a5d
 2013-01-30 15:01:19 -06:00
Roger Ferrel
0d56bd5b25 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.) 
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 97b6a1a810 [formerly 7a7f86bfe6] [formerly 97b6a1a810 [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: 234b632c75 [formerly 4dbb053d65]
Former-commit-id: 82b029928e
 2013-01-30 13:11:56 -06:00
Ben Steffensmeier
31e9b542c1 Issue #1521 add extra validation and checks to grid factory 
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 9f5a0a1f58 [formerly 52337a2e6e] [formerly 9f5a0a1f58 [formerly 52337a2e6e] [formerly 437e6ae690 [formerly 3023799852acfb932f2afcb0c4ed1cf764add776]]]
Former-commit-id: 437e6ae690
Former-commit-id: dcb8a26ca2 [formerly 449dcb2df2]
Former-commit-id: c5ff5a6f61
 2013-01-29 17:37:39 -06:00
Lee Venable
3de54778b2 Merge "Issue #1495 add ensemble to Subscription copy constructor" into 13.2.1_delivery 
Former-commit-id: f88f8211e1 [formerly b82909bfb1] [formerly f88f8211e1 [formerly b82909bfb1] [formerly 29a25cbe10 [formerly f895f5b777a8fdb292a20820678417decfd67ff9]]]
Former-commit-id: 29a25cbe10
Former-commit-id: ede2bc6159 [formerly 70ed87a093]
Former-commit-id: 4bf1bf11f3
 2013-01-29 16:46:31 -06:00
Lee Venable
0583d980e3 Merge "Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon." into 13.2.1_delivery 
Former-commit-id: c9cd8c4c76 [formerly 9f222c9643] [formerly c9cd8c4c76 [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 0b005f08fb [formerly 56f4567566]
Former-commit-id: 6668070073
 2013-01-29 16:44:53 -06:00
Steve Harris
99bc358644 Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery 
Former-commit-id: e655d297f7 [formerly 0505ed0a72] [formerly e655d297f7 [formerly 0505ed0a72] [formerly 6040272573 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 75f6e61e6f [formerly 513d49939f]
Former-commit-id: ba97151132
 2013-01-29 15:57:21 -06:00
Steve Harris
9ab34b7aeb 13.2.1-3 baseline 
Former-commit-id: 283147571f [formerly f45120a1f4] [formerly 283147571f [formerly f45120a1f4] [formerly 7a739c6a5b [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: daca1c3e73 [formerly 3edfa1e0be]
Former-commit-id: dbaf4a3e39
 2013-01-29 15:52:43 -06:00
Mike Duff
302b467d5e Issue #1550 - Add ability for MPE to preload maps on perspective open. 
Former-commit-id: 944c5a4732 [formerly f9fec9668c] [formerly 944c5a4732 [formerly f9fec9668c] [formerly 5940423ac8 [formerly 779ff3238cd9aba2980f589721a0f5ccfff4a15e]]]
Former-commit-id: 5940423ac8
Former-commit-id: 2edb4f1117 [formerly b55adb3cce]
Former-commit-id: e1c6fbc93d
 2013-01-29 15:39:40 -06:00
Ben Steffensmeier
b81b7c0d0e Issue #1495 add ensemble to Subscription copy constructor 
Former-commit-id: c81ed396af [formerly d17afdc1fa] [formerly c81ed396af [formerly d17afdc1fa] [formerly 5db16973bd [formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]]
Former-commit-id: 5db16973bd
Former-commit-id: f0fe3654c7 [formerly daf368ef21]
Former-commit-id: 703fa6695e
 2013-01-29 13:42:01 -06:00
Dustin Johnson
64c335478a Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager 
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: c8302eb9f8 [formerly b0125d6d7e] [formerly c8302eb9f8 [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: a463f7ef2b [formerly 150c5275ca]
Former-commit-id: 6b46be5bc6
 2013-01-29 10:10:54 -06:00
Lee Venable
39a081b349 Merge "Issue #1528 Fix subscription priorities to be the same from domain object to GUI Fix incorrect use of enum ordinal value mappings to priorities. Fix broken bandwidth priority scheduling." into 13.2.1_delivery 
Former-commit-id: ef51b388d7 [formerly 06900ccbb7] [formerly ef51b388d7 [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: df5bcf64de [formerly fb942ec7c2]
Former-commit-id: b2cd64020d
 2013-01-29 09:59:59 -06:00
Lee Venable
7ea5d27d7a Merge "Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids" into 13.2.1_delivery 
Former-commit-id: 7d459d4d26 [formerly 85cff28b91] [formerly 7d459d4d26 [formerly 85cff28b91] [formerly 71da745d93 [formerly a997bb9673162b8860ec9bd61118a52a575d4693]]]
Former-commit-id: 71da745d93
Former-commit-id: df40bb8ed5 [formerly 2a4563bd14]
Former-commit-id: 7cace56085
 2013-01-29 09:59:06 -06:00
Nate Jensen
2990d90bcb Issue #1526 improved exception handling per code review comments 
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: d155f573c9 [formerly 471dd02143] [formerly d155f573c9 [formerly 471dd02143] [formerly 530fdbe151 [formerly 6abffb7aeb4011db9f6380fc644312b408bb75fa]]]
Former-commit-id: 530fdbe151
Former-commit-id: 2c85ed97e3 [formerly d233055696]
Former-commit-id: d78dbb1390
 2013-01-29 09:25:19 -06:00
Steve Harris
7395af8e56 Merge branch '13.2.1_delivery' into development 
Former-commit-id: ef2526ed44 [formerly 6bd7e027b6] [formerly ef2526ed44 [formerly 6bd7e027b6] [formerly b5b1823104 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: 27725703d5 [formerly 0a31815c66]
Former-commit-id: fa305d03ba
 2013-01-28 16:28:58 -06:00
Richard Peter
7a41e41ca9 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development 
Former-commit-id: 59ef7758f1 [formerly 6eb11703e4] [formerly 59ef7758f1 [formerly 6eb11703e4] [formerly 2946e97294 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 7c9b9b0237 [formerly 878cbe1695]
Former-commit-id: 4f61e88c6f
 2013-01-28 15:27:23 -06:00
Max Schenkelberg
21d7fb592c Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon. 
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d

Former-commit-id: 796522b6d0 [formerly 95ccc76272] [formerly 796522b6d0 [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 0019b43582 [formerly 99c8a97f8c]
Former-commit-id: cfcffa3b2e
 2013-01-28 14:30:53 -06:00
Richard Peter
f810e098d0 Issue #1408: Merge branch 'ss_builds' (13.2.1) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.datadelivery.feature/feature.xml
	cave/com.raytheon.uf.viz.datadelivery/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.datadelivery/res/spring/datadelivery-services.xml
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/BandwidthCanvasComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/UserSelectComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/services/DataDeliveryServices.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/DeleteGroupDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/GroupAddDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/RequestFromServerPermissionsService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionService.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubApprovalTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/presenter/CreateSubscriptionDlgPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/VerticalSubsetTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/presenter/GriddedTimingSelectionPresenter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/xml/SubsetXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/OperatorAdapter.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXML.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/CreateEditRuleDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/Operator.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemLatencyTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemManagementDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemPriorityTab.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/system/SystemRuleManager.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataSetFrequency.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/NotificationHandler.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFELegendResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/MenuLoader.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.satellite/res/spring/satellite-ingest.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.bandwidth/utility/common_static/base/datadelivery/systemManagement/rules/latencyRules.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Ensemble.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSet.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedDataSetMetaData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Parameter.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Provider.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/DataSizeUtils.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/util/LookupManager.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/rim/v4/ExtensibleObjectType.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/SubscriptionNotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/MainSequenceCrawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/OPENDAPServiceConfig.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/harvester/NOMADS-harvester.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParser.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtility.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRequestBuilder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalGenerator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	nativeLib/org.apache.qpid/lib/libqpidclient.so
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	tests/.classpath
	tests/unit/com/raytheon/uf/common/datadelivery/registry/OpenDapGriddedDataSetFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderTest.java
	tests/unit/com/raytheon/uf/common/localization/TestPathManager.java
	tests/unit/com/raytheon/uf/common/registry/RegistryManagerTest.java
	tests/unit/com/raytheon/uf/common/stats/data/DataPointTest.java
	tests/unit/com/raytheon/uf/common/stats/data/StatsDataTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/harvester/CrawlerTest.java
	tests/unit/com/raytheon/uf/edex/stats/data/StatsDataAccumulatorTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/AbstractSubscriptionServiceTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/subscription/xml/RuleXMLTest.java
	tests/unit/com/raytheon/uf/viz/datadelivery/utils/DataSizeUtilTest.java

Former-commit-id: 094fab7d16 [formerly 116ed10973] [formerly 094fab7d16 [formerly 116ed10973] [formerly 81f14729ae [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 74b80fdc81 [formerly d0e3bbf826]
Former-commit-id: 1058dba963
 2013-01-25 15:54:27 -06:00
Dustin Johnson
7d73d0bd64 Issue #1528 Fix subscription priorities to be the same from domain object to GUI 
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: 50bfcd3fbf [formerly 41c0ff85ff] [formerly 50bfcd3fbf [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: 4ab288ae75 [formerly 4465094fe9]
Former-commit-id: b78257ab11
 2013-01-25 14:30:04 -06:00
Dave Hladky
9879d31626 Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids 
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8

Former-commit-id: fe864302d2 [formerly b1dddd37a6] [formerly fe864302d2 [formerly b1dddd37a6] [formerly 04a955ff53 [formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]]
Former-commit-id: 04a955ff53
Former-commit-id: 308ed4c69b [formerly 2e396e04f7]
Former-commit-id: e968417c2a
 2013-01-25 10:58:22 -06:00
Steve Harris
a7d7847b06 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 618cf868c5 [formerly f673583915] [formerly 618cf868c5 [formerly f673583915] [formerly 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: a85c81289e [formerly 25fecb8b4f]
Former-commit-id: 895b25bac4
 2013-01-25 10:54:51 -06:00
Lee Venable
c959752c76 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery 
Former-commit-id: 8d19ab695a [formerly 79fca0b122] [formerly 8d19ab695a [formerly 79fca0b122] [formerly e49a718462 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]]
Former-commit-id: e49a718462
Former-commit-id: 4c07c59837 [formerly d04924fd3a]
Former-commit-id: 45eaf08797
 2013-01-25 10:46:40 -06:00