Commit graph

694 commits

Author SHA1 Message Date
Bryan Kowal
285e192bd1 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: 874d754543 [formerly 81da18f851] [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7815b651bb [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 79a63957141ccebe7c30159fdecdcee461b2f5f5 [formerly 99994d3151]
Former-commit-id: efe288c82c
2013-02-05 13:25:15 -06:00
Dave Hladky
d146d3d22d Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 5bc083f84c [formerly 7b49430e34] [formerly c0712160d7] [formerly 7af5aab08a [formerly c0712160d7 [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]]
Former-commit-id: 7af5aab08a
Former-commit-id: 291393e5c8803d3a23bd216c3d4010eab72c680f [formerly f6bd4ea0fa]
Former-commit-id: b134741e4c
2013-02-05 12:23:56 -06:00
Richard Peter
3fa16b992a Merge "Issue #1517 Added SPC Prob menu changes." into development
Former-commit-id: 8a80d31c13 [formerly e4894a01fd] [formerly 74b3cc23ff] [formerly 4170ba9558 [formerly 74b3cc23ff [formerly 153173d6f07aaf135be6e5422c893942deef5371]]]
Former-commit-id: 4170ba9558
Former-commit-id: 2dd0fef76d1ae56a21130b5408c18ad785afed21 [formerly a0807f8ecb]
Former-commit-id: 501e305a66
2013-02-05 09:23:20 -06:00
Steve Harris
850ee1cb70 Merge branch '13.2.1_delivery' into development
Former-commit-id: df85fb6a91 [formerly 9595fefb4b] [formerly d997d99f05] [formerly f380667b34 [formerly d997d99f05 [formerly 815e8b741b173044f8f20f537674d685b50ed6af]]]
Former-commit-id: f380667b34
Former-commit-id: a90fee98df8fb5092bfc0a8af5b9fc86d1b97a1d [formerly 930f1f13c0]
Former-commit-id: 24ff063657
2013-02-04 15:26:44 -06:00
Bryan Kowal
fd3e2e7daa Issue #1553 - remove duplicated "image" plugin
Change-Id: Ia0328efb3f45dc233118b7ef209e53b1f4ae1f5e

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

Former-commit-id: 6bdfd5c185 [formerly f044441759] [formerly ea6dec5db8] [formerly dd854cdb85 [formerly ea6dec5db8 [formerly d46cda9c95a94572fa2e6c89ed4298a55cf76e15]]]
Former-commit-id: dd854cdb85
Former-commit-id: 75f66311998c1ca7685c9b07d9380e904de0cccb [formerly d15a57427e]
Former-commit-id: 53bf879c83
2013-02-04 09:34:40 -06:00
Dustin Johnson
82c86df837 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: 3112fce540 [formerly cf063000ca] [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 3b20efeb7d [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 3cb29f382d95ee1e760fcb5f018ec70b8bd3cb00 [formerly b5f69e21d8]
Former-commit-id: 2940a059d1
2013-02-04 09:00:33 -06:00
Brad Gonzales
3e4338339b 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: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]
Former-commit-id: 8fc5c18ebd
2013-02-04 08:52:33 -06:00
Ben Steffensmeier
cb3e583e4d Issue #1553 initial implementation of radar factory
Change-Id: I86375a74f96159a9ed32d20ffd38168d9308c574

Former-commit-id: 671b308661 [formerly efc647e6ba] [formerly ed60f1a696] [formerly 0eb24c11e2 [formerly ed60f1a696 [formerly 1db5404b22544dbc8954825121217c0ffce95fa0]]]
Former-commit-id: 0eb24c11e2
Former-commit-id: ac795bb8660179acccee3749e41de2f355d9fba5 [formerly 681b30b3d8]
Former-commit-id: 8cbde9ef7d
2013-02-01 16:29:13 -06:00
Nate Jensen
2a90a0d8d8 Merge "Issue #1553 move radar units into common plugin for use in data access factory Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f" into development
Former-commit-id: 14dd6339ae [formerly d7677be8a4] [formerly f77a1dc85c] [formerly e1166c246c [formerly f77a1dc85c [formerly 358b990e43d0f5952ee3c33521778541bd1b7c04]]]
Former-commit-id: e1166c246c
Former-commit-id: 05b4ee9fa87721f6e86819b21845fe9b0377e88f [formerly 3ab7c693de]
Former-commit-id: d996064b91
2013-02-01 15:01:24 -06:00
Ben Steffensmeier
f596456173 Issue #1553 fix RenderableTileSet for round projections.
Former-commit-id: a263467a1f [formerly f3aa9d3ba4] [formerly 1e6d6ac799] [formerly f31215a999 [formerly 1e6d6ac799 [formerly 8bd997f193b4a8cc75fc6609b321b29f2524c08b]]]
Former-commit-id: f31215a999
Former-commit-id: cf050889363cd53bbb18443f21e63839f4343968 [formerly 8c3deb1a93]
Former-commit-id: 90070b40d2
2013-01-31 17:17:30 -06:00
Ben Steffensmeier
f603722c10 Issue #1553 move radar units into common plugin for use in data access factory
Change-Id: I32d01625bcbc6555b402048ebb34cee21f0b855f

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

Former-commit-id: 5e09aa6178 [formerly b2870a012e] [formerly da1061baa6] [formerly f72968824a [formerly da1061baa6 [formerly 945b2e64b971fc31691d550e6c629f43db9a9c99]]]
Former-commit-id: f72968824a
Former-commit-id: 8bd88b7d3572f3c886892e2940fca27533244f24 [formerly 53eddc3ec8]
Former-commit-id: ed42a6d939
2013-01-31 16:01:04 -06:00
Lee Venable
1e73fe7de9 Merge "Issue #1557 Added allowDuplicates XML element to point source configuration. Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b" into development
Former-commit-id: 5713fbaf3d [formerly bc4b462c69] [formerly 3cc2665f41] [formerly f2e7f7ff1b [formerly 3cc2665f41 [formerly a7e3ea831a4cbd3e5ab04f3288b8eac8f74f70f3]]]
Former-commit-id: f2e7f7ff1b
Former-commit-id: ef577cd9e5acc028e7e77246ad134c42e73759f1 [formerly 16bc40cec8]
Former-commit-id: f192004c51
2013-01-31 15:54:05 -06:00
Bryan Kowal
55d7d97a2c Merge "Issue #1551 - adding maps to the Data Access Framework" into development
Former-commit-id: 58c8bd56a6 [formerly 776e7ab5c2] [formerly f585de398b] [formerly 73cf3ac730 [formerly f585de398b [formerly d722b34158a74e922025804a2f0953226aae7a98]]]
Former-commit-id: 73cf3ac730
Former-commit-id: 7746b013a30e64c9527f277708407f8849cd3f84 [formerly a65ccede20]
Former-commit-id: 6027369645
2013-01-31 15:24:30 -06:00
Jonathan Sanchez
91060ecabc Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b

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

Former-commit-id: 69da53d6ea [formerly 25b05eada7] [formerly acb6889b1d] [formerly 9806387a8b [formerly acb6889b1d [formerly 495a30e31a16f0c595c35555e4d804585dcb5a96]]]
Former-commit-id: 9806387a8b
Former-commit-id: e78c39bfeb8f34b8c2db05946d74ebc387fd320f [formerly db40c02bbf]
Former-commit-id: d68bb6da0d
2013-01-31 14:43:26 -06:00
Steve Harris
41b14f0fa2 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: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
2013-01-31 10:19:14 -06:00
Bryan Kowal
46fb2fcfcc 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: 832094f721 [formerly 6ea0653c78] [formerly 964b30d5f2] [formerly 5d83f9f3d1 [formerly 964b30d5f2 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 3ee1df2f447ab32d118f3e09a714122496b12556 [formerly e86fda2a6f]
Former-commit-id: 0557ecfed3
2013-01-31 10:03:10 -06:00
Dustin Johnson
d3dfd0d13e Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: 1a5b0db18a [formerly e64e36ecf2] [formerly f361f5a6a1] [formerly 5830a98a51 [formerly f361f5a6a1 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]
Former-commit-id: 5830a98a51
Former-commit-id: 8e1ba93b749807b664b2caa682b0ba179d0ff600 [formerly d7077690d8]
Former-commit-id: 0185add187
2013-01-31 08:39:08 -06:00
Nate Jensen
98e25ac4fd Merge "Issue #1521 add extra validation and checks to grid factory Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c" into development
Former-commit-id: 8b357a94b0 [formerly f1cf8bff45] [formerly 88b52e25f2] [formerly b765544b40 [formerly 88b52e25f2 [formerly af723dd7ec322d586b7eb48381105c1043f32e67]]]
Former-commit-id: b765544b40
Former-commit-id: bc5226b98911daa3e9701c761e635697371d4ba2 [formerly 8952df8497]
Former-commit-id: 2db9dc1130
2013-01-30 15:01:19 -06:00
Roger Ferrel
b14548f572 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: 2db9c6d959 [formerly 97b6a1a810] [formerly 7a7f86bfe6] [formerly fbcc5fb9a0 [formerly 7a7f86bfe6 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]]]
Former-commit-id: fbcc5fb9a0
Former-commit-id: e97f47d41962af0f093d3656148674e9f19fe55b [formerly 4dbb053d65]
Former-commit-id: 234b632c75
2013-01-30 13:11:56 -06:00
Ben Steffensmeier
7e8791ae6f Issue #1521 add extra validation and checks to grid factory
Change-Id: If7903f96bad2d21e9e9eaea86fa5ccc9b9374c9c

Former-commit-id: 206c06669a [formerly 9f5a0a1f58] [formerly 52337a2e6e] [formerly 437e6ae690 [formerly 52337a2e6e [formerly 3023799852acfb932f2afcb0c4ed1cf764add776]]]
Former-commit-id: 437e6ae690
Former-commit-id: 7641964f34d6f2992b3c4b7cd6d97f0a437e6cf4 [formerly 449dcb2df2]
Former-commit-id: dcb8a26ca2
2013-01-29 17:37:39 -06:00
Lee Venable
d25d858a66 Merge "Issue #1495 add ensemble to Subscription copy constructor" into 13.2.1_delivery
Former-commit-id: 1006b27149 [formerly f88f8211e1] [formerly b82909bfb1] [formerly 29a25cbe10 [formerly b82909bfb1 [formerly f895f5b777a8fdb292a20820678417decfd67ff9]]]
Former-commit-id: 29a25cbe10
Former-commit-id: c1c55ff56072f22d82c0594793c1ce48f62a40d9 [formerly 70ed87a093]
Former-commit-id: ede2bc6159
2013-01-29 16:46:31 -06:00
Lee Venable
71154555c8 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: 2342b84f34 [formerly c9cd8c4c76] [formerly 9f222c9643] [formerly 52e10c8c8a [formerly 9f222c9643 [formerly 4e223a32936225205b61e8d9983a9e9e37dd147a]]]
Former-commit-id: 52e10c8c8a
Former-commit-id: 7e2adce84c3f59d8322483b0899c3a739f477c13 [formerly 56f4567566]
Former-commit-id: 0b005f08fb
2013-01-29 16:44:53 -06:00
Steve Harris
c9bc690eca Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
2013-01-29 15:52:43 -06:00
Mike Duff
ac13852b92 Issue #1550 - Add ability for MPE to preload maps on perspective open.
Former-commit-id: 1740e14fa9 [formerly 944c5a4732] [formerly f9fec9668c] [formerly 5940423ac8 [formerly f9fec9668c [formerly 779ff3238cd9aba2980f589721a0f5ccfff4a15e]]]
Former-commit-id: 5940423ac8
Former-commit-id: 199352144e883563c5a96c9514598f1ea31d4c67 [formerly b55adb3cce]
Former-commit-id: 2edb4f1117
2013-01-29 15:39:40 -06:00
Ben Steffensmeier
d1f3af83cc Issue #1495 add ensemble to Subscription copy constructor
Former-commit-id: 769f666f45 [formerly c81ed396af] [formerly d98ce9b9135373e84c866df1cd06b380db2b8d14 [formerly d17afdc1fa]] [formerly 5db16973bd [formerly d17afdc1fa [formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]]
Former-commit-id: 5db16973bd
Former-commit-id: 500339d4ade6e63dc5f9ae3b3b376ca4c94d77db [formerly daf368ef21]
Former-commit-id: f0fe3654c7
2013-01-29 13:42:01 -06:00
Dustin Johnson
4c323a7bf8 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 8897d2b302 [formerly c8302eb9f8] [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly b0125d6d7e [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 696f9cd7deb51ded1ebc38bd99f68f88ea3f520b [formerly 150c5275ca]
Former-commit-id: a463f7ef2b
2013-01-29 10:10:54 -06:00
Lee Venable
b865087c22 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: b35b20a245 [formerly ef51b388d7] [formerly 06900ccbb7] [formerly f98e5b35e1 [formerly 06900ccbb7 [formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]]
Former-commit-id: f98e5b35e1
Former-commit-id: 4ec38d9e476c5f723089251bd22d992fcc9b56df [formerly fb942ec7c2]
Former-commit-id: df5bcf64de
2013-01-29 09:59:59 -06:00
Lee Venable
b4385740f6 Merge "Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids" into 13.2.1_delivery
Former-commit-id: 9493ce7146 [formerly 7d459d4d26] [formerly 85cff28b91] [formerly 71da745d93 [formerly 85cff28b91 [formerly a997bb9673162b8860ec9bd61118a52a575d4693]]]
Former-commit-id: 71da745d93
Former-commit-id: 0497629b3690f00dc20242a70dabc2157a821bb8 [formerly 2a4563bd14]
Former-commit-id: df40bb8ed5
2013-01-29 09:59:06 -06:00
Nate Jensen
894b6a574f Issue #1526 improved exception handling per code review comments
Change-Id: I9dd95cd3d130ee8a0bbc617af62b9f7f879548a7

Former-commit-id: 8e90784e71 [formerly d155f573c9] [formerly 471dd02143] [formerly 530fdbe151 [formerly 471dd02143 [formerly 6abffb7aeb4011db9f6380fc644312b408bb75fa]]]
Former-commit-id: 530fdbe151
Former-commit-id: ad1fb77c31579ecb8b7b6e3561db673a9d9913f2 [formerly d233055696]
Former-commit-id: 2c85ed97e3
2013-01-29 09:25:19 -06:00
Steve Harris
51c02cbee7 Merge branch '13.2.1_delivery' into development
Former-commit-id: 8b3a3f0325 [formerly ef2526ed44] [formerly cc0cfaa165c374895aa9647e3fb34fce2187f60e [formerly 6bd7e027b6]] [formerly b5b1823104 [formerly 6bd7e027b6 [formerly 11debd68cfd26c54ad3f2bb83455cdbaf86c2148]]]
Former-commit-id: b5b1823104
Former-commit-id: be8acf0a7b8afdcee2035efbe867156750b66ce4 [formerly 0a31815c66]
Former-commit-id: 27725703d5
2013-01-28 16:28:58 -06:00
Richard Peter
0ae1b55321 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: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]
Former-commit-id: 7c9b9b0237
2013-01-28 15:27:23 -06:00
Max Schenkelberg
18411217a1 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: 681a2a6ec4 [formerly 796522b6d0] [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 95ccc76272 [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 659fd21b93254587addaccc93ad503a195b98bd4 [formerly 99c8a97f8c]
Former-commit-id: 0019b43582
2013-01-28 14:30:53 -06:00
Richard Peter
5071a1181e 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: b2ebea951c [formerly 094fab7d16] [formerly 116ed10973] [formerly 81f14729ae [formerly 116ed10973 [formerly 3121ee74e49163c7f5be695adfc9622ec997dcea]]]
Former-commit-id: 81f14729ae
Former-commit-id: 6d92a3ebba31fa453ea1f58923ba6feb92785d9f [formerly d0e3bbf826]
Former-commit-id: 74b80fdc81
2013-01-25 15:54:27 -06:00
Dustin Johnson
dac4c429e7 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: f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]
Former-commit-id: 4ab288ae75
2013-01-25 14:30:04 -06:00
Dave Hladky
16286868df Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8

Former-commit-id: 01331e8d69 [formerly fe864302d2] [formerly b1dddd37a6] [formerly 04a955ff53 [formerly b1dddd37a6 [formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]]
Former-commit-id: 04a955ff53
Former-commit-id: f8115fb5a00858c1eefeb6e8372086fe5bc84c2c [formerly 2e396e04f7]
Former-commit-id: 308ed4c69b
2013-01-25 10:58:22 -06:00
Steve Harris
1397f8a811 Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]
Former-commit-id: a85c81289e
2013-01-25 10:54:51 -06:00
Lee Venable
fccba2eb96 Merge "Issue #1495 fix fens regex." into 13.2.1_delivery
Former-commit-id: 5759947256 [formerly 8d19ab695a] [formerly 79fca0b122] [formerly e49a718462 [formerly 79fca0b122 [formerly 4155a028c0ea9de25cdcd71f523f7c47cdc92f32]]]
Former-commit-id: e49a718462
Former-commit-id: 25562daeb4ca7d1904a42978195b51ed2158e7a3 [formerly d04924fd3a]
Former-commit-id: 4c07c59837
2013-01-25 10:46:40 -06:00
Steve Harris
0f4fcd0ba8 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
2013-01-25 09:07:12 -06:00
Lee Venable
e2f088c003 Merge "Issue #1523 - Fix problem with legend keys." into 13.2.1_delivery
Former-commit-id: 695f441e3f [formerly 0767f1a50b] [formerly 9756c431fd] [formerly e4142b63c9 [formerly 9756c431fd [formerly 2dcf981656f547cc07f8124eadc32ca0204b4b46]]]
Former-commit-id: e4142b63c9
Former-commit-id: 3db7896ccb9207afe3cea12b611de87c2bb0fbeb [formerly 063ffa26eb]
Former-commit-id: 4bf28dd204
2013-01-24 16:52:17 -06:00
Nate Jensen
9fb144f73e Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]
Former-commit-id: 04a397866a
2013-01-24 16:41:02 -06:00
Steve Harris
7b1dbd3c56 Merge "Issue #1496 Changes to move what may be long queries off the UI thread. Changed based on comments in patch set 2." into development
Former-commit-id: d8882d38ef [formerly 88734ab106] [formerly ca23ba06e5] [formerly 267d860cd1 [formerly ca23ba06e5 [formerly 64f9216a13fbad67733c5babde8a8f507bbe399f]]]
Former-commit-id: 267d860cd1
Former-commit-id: 88968d3e3fb4d249efd67cec63084edac1ce39bb [formerly 9b3713763d]
Former-commit-id: bd1393541a
2013-01-24 15:02:36 -06:00
Benjamin Phillippe
3c6d7f5ad0 Issue #1525 Improved Dataset Discovery Browser query performance
Change-Id: Ic7c7994e5768238393c1fdbb73ec043cc1eb86f1

Former-commit-id: 8bad25fac2 [formerly eaeceb82cf] [formerly 49c66d2e47] [formerly bcd7e5629f [formerly 49c66d2e47 [formerly b112d2eba2395f693beedd64ca97c140cba161f1]]]
Former-commit-id: bcd7e5629f
Former-commit-id: a06a2afe6499ad3423c21a24b4326a5bdbcc606d [formerly 4042027a25]
Former-commit-id: 98cd7c4339
2013-01-24 13:17:28 -06:00
Mike Duff
a09e8c5570 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]
Former-commit-id: 05e9b88566
2013-01-24 12:39:12 -06:00
Ben Steffensmeier
7633292992 Issue #1495 fix fens regex.
Former-commit-id: 314f90d933 [formerly 37d712231a] [formerly e28749bc03] [formerly 2cb3fe3dc2 [formerly e28749bc03 [formerly fda3d6ae8ecd44d03b9c4afb1fd0b93b0f3aaccf]]]
Former-commit-id: 2cb3fe3dc2
Former-commit-id: 84248b3ab25b0a8d2618c7df04bb826cfc3172c5 [formerly 243af2b479]
Former-commit-id: 07d1695d81
2013-01-24 10:53:51 -06:00
Mike Duff
4ab0eecfa0 Issue #1523 - Finalize registry and data delivery stats
Former-commit-id: 4186b10583 [formerly cbfd355219] [formerly 9c033e6484] [formerly 561e83454f [formerly 9c033e6484 [formerly d691b22ff903b2231e2a04747a8b4f93174ec4e3]]]
Former-commit-id: 561e83454f
Former-commit-id: f8db6cdbac08b1f47e17566c905c303288aef176 [formerly 29939914a2]
Former-commit-id: 7e421afc03
2013-01-23 14:40:23 -06:00