Commit graph

22 commits

Author SHA1 Message Date
Steve Harris
a8d7e2a51a 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 f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2 [formerly 73d9455c65] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f]
Former-commit-id: 2107a54161
2013-01-31 10:19:14 -06:00
Dustin Johnson
7a26ed4303 Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: 1a5b0db18a [formerly e64e36ecf2] [formerly f361f5a6a1] [formerly 1a5b0db18a [formerly e64e36ecf2] [formerly f361f5a6a1] [formerly 5830a98a51 [formerly f361f5a6a1 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]]]]
Former-commit-id: 5830a98a51
Former-commit-id: d3dfd0d13e [formerly 0185add187] [formerly 8e1ba93b749807b664b2caa682b0ba179d0ff600 [formerly d7077690d8]]
Former-commit-id: 91fdb5ab04eacbddb531b408e1374ea17f95f146 [formerly 74f27ce9f8]
Former-commit-id: ba39807ebe
2013-01-31 08:39:08 -06:00
Dustin Johnson
1c23b90572 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 8897d2b302 [formerly c8302eb9f8] [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly b0125d6d7e [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 4c323a7bf8 [formerly a463f7ef2b] [formerly 696f9cd7deb51ded1ebc38bd99f68f88ea3f520b [formerly 150c5275ca]]
Former-commit-id: 3eac8b9d66a42f44727f51f26828ff276c10b6e2 [formerly 6b46be5bc6]
Former-commit-id: 64c335478a
2013-01-29 10:10:54 -06:00
Dustin Johnson
4064a06a23 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 f8d6fb35b4 [formerly 50bfcd3fbf] [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]]
Former-commit-id: f88a5c1b95
Former-commit-id: dac4c429e7 [formerly 4ab288ae75] [formerly a9e048c56f0e0bcf1daa53c2f59ef7d20bb01b9b [formerly 4465094fe9]]
Former-commit-id: 053fc880d7a6ac70b3580a152303d0a3ab5154a5 [formerly b78257ab11]
Former-commit-id: 7d73d0bd64
2013-01-25 14:30:04 -06:00
Steve Harris
379a9dd95c Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]
Former-commit-id: 827611474f
Former-commit-id: 1397f8a811 [formerly a85c81289e] [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]]
Former-commit-id: f2d8f7cd1be3a2bba4584db2da805b450fce002a [formerly 895b25bac4]
Former-commit-id: a7d7847b06
2013-01-25 10:54:51 -06:00
Mike Duff
27a9b15eea Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly ed32adc993 [formerly 478ec72102] [formerly ba5014b162] [formerly c06ed9f9dc [formerly ba5014b162 [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]]]]
Former-commit-id: c06ed9f9dc
Former-commit-id: a09e8c5570 [formerly 05e9b88566] [formerly 1b1ac20cfdbaa8e552b23d4725c85806c869b494 [formerly fbf92a6d06]]
Former-commit-id: ef3455ec3540faf3e7ca24232e1af94de307fd18 [formerly f9b7cae879]
Former-commit-id: 0752ecb4f1
2013-01-24 12:39:12 -06:00
Mike Duff
5cf904ba6f Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly d54b3a3519 [formerly 712862d96f] [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: aa26a4d5d2 [formerly dfcce57a0a] [formerly 1dd22669a9d4462243dd018526062181eb8a7d09 [formerly 4cd7deb608]]
Former-commit-id: 9fd21a8ac89c2efd5bc6d198d4f4290003357cb3 [formerly ac9f95d1d0]
Former-commit-id: df41fe4395
2013-01-23 11:17:36 -06:00
Dustin Johnson
1e301478b9 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly 0f7b01795d [formerly 504268f0f3] [formerly 6c1818d544] [formerly f730422834 [formerly 6c1818d544 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]]
Former-commit-id: f730422834
Former-commit-id: 70bce9d505 [formerly 2e09d46fea] [formerly 76d8b5641220e657d9123f65878c0ce41da1c8f6 [formerly 516ac1ab9a]]
Former-commit-id: ba860324a0a7e30cd96383cd383eb22a2db70a82 [formerly 7918b009ff]
Former-commit-id: 4cec3d4356
2013-01-23 08:06:52 -06:00
Steve Harris
4ed4f88644 Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 7d6a1a7e3a [formerly 8b578c10dc] [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]]
Former-commit-id: f741fd6472c315f672ab76f7a397d383205c6f95 [formerly b03d5ce450]
Former-commit-id: c60051d5df
2013-01-22 16:45:48 -06:00
Dustin Johnson
a2ca5bd06f Issue #1441 Create new datadelivery services plugin
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 40ef4c5947 [formerly 3ec05a5a9c] [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 557de162b0 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 02604beac9 [formerly 756080321e] [formerly 6bc759f6c2019b3fef1eb1a080cf002dc07697ce [formerly a3c99f86bb]]
Former-commit-id: 07f8633fb9fb320b16573c6dc1052a735e4bf124 [formerly 2168713505]
Former-commit-id: 7da688f138
2013-01-22 11:45:18 -06:00
Steve Harris
f8888e5294 Merge branch '13.2.1_delivery' into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java

Former-commit-id: bf957a3bd7 [formerly 89f3120c0c] [formerly 2c9c6b7dde] [formerly bf957a3bd7 [formerly 89f3120c0c] [formerly 2c9c6b7dde] [formerly 407d73a04f [formerly 2c9c6b7dde [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]]]
Former-commit-id: 407d73a04f
Former-commit-id: f2b52084dc [formerly 0ca985778e] [formerly 5714abfd35536ab502243bd9ff20068b0fa7b7ac [formerly bbb637faf3]]
Former-commit-id: 56287c40efa8ad1381c1a6f8efbc143f960cefd1 [formerly 45760d8bef]
Former-commit-id: 61a9f644d9
2013-01-18 10:52:29 -06:00
Dustin Johnson
70e2870b54 Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 088b0d4c08 [formerly b1ce19e41d] [formerly 74d5a70c30] [formerly 088b0d4c08 [formerly b1ce19e41d] [formerly 74d5a70c30] [formerly 037dabb683 [formerly 74d5a70c30 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]]]
Former-commit-id: 037dabb683
Former-commit-id: 837c1a0492 [formerly fce3f8bec9] [formerly 4c1037f281d91482cf2e0798dc7d242a1877cfba [formerly 6468029207]]
Former-commit-id: 58749b06f78b3c611a53c13d20facc15be2e4ccb [formerly 799cf85f82]
Former-commit-id: e3cf0246c7
2013-01-17 12:48:01 -06:00
Roger Ferrel
815dd12ad9 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 96deac5f43 [formerly 86d51634dc] [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]]
Former-commit-id: 06cef0013d52ca86020642bf82ef1a6b6988048f [formerly 722708105f]
Former-commit-id: 0435636b1e
2013-01-16 16:53:29 -06:00
Dustin Johnson
693e9d93a2 Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 19d3a14d4f [formerly b627dfc054 [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: 56b47ffbf1 [formerly ecb1d5564a] [formerly a1d7a7e343770b91b36afc9c193dcdcee6b09ef3 [formerly c750e27389]]
Former-commit-id: d950f4621f676478de7a7656c2bccf8b324d5f74 [formerly 19558ae3fa]
Former-commit-id: 4ab214c5d7
2013-01-16 12:21:11 -06:00
Dustin Johnson
23e70d529a Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]]
Former-commit-id: 2cf52d976b
Former-commit-id: b18fc5ff5e [formerly 94e95f3e07] [formerly d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]]
Former-commit-id: 21ec2413c9d2a86c99721c6504722141f9046ddb [formerly 5cd31fc0b7]
Former-commit-id: 1070de3f2d
2013-01-15 10:18:14 -06:00
Mike Duff
ac03c3993c Issue #1420 - Additional changes and cleanup
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 0eb256fc41 [formerly 329a010b07] [formerly 279729e88e] [formerly 8411a46e3e [formerly 279729e88e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]]
Former-commit-id: 8411a46e3e
Former-commit-id: 135fd5c13d [formerly d3ed6f6148] [formerly 8b9f15d6e0da73076d2f6aec446ddc93878baabc [formerly 950c71c164]]
Former-commit-id: 0e71292ea44022ed0f31fa4514b8529d747d49a7 [formerly 772154de38]
Former-commit-id: 66dc038d02
2013-01-11 14:38:34 -06:00
Richard Peter
038b214887 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f [formerly cf815a4c72] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Dustin Johnson
f275418843 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]]
Former-commit-id: c4068d27bf
Former-commit-id: 2a306b4122 [formerly a4414d409a] [formerly c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]]
Former-commit-id: 3330a60d2df34bd1b8732593f276c83b6d1c1c02 [formerly 9b3cf3308f]
Former-commit-id: ef31fc45a9
2013-01-11 12:23:15 -06:00
Dave Hladky
87ae3ccfb8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 59c349ac77 [formerly fe486b4889] [formerly 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]]
Former-commit-id: 57ac28b8518a3193cbd3b4125cd190f547bac07f [formerly a51f8f449b]
Former-commit-id: b5ea7aaff8
2013-01-11 11:59:36 -06:00
Dustin Johnson
2598fc06d8 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]
Former-commit-id: 446f65776e
Former-commit-id: 6984791be8 [formerly 7bf029eb7e] [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]]
Former-commit-id: 4b7dc8fbd66d90306e884b8ea9c8af6f53371156 [formerly 6fb6bc8f87]
Former-commit-id: f269969791
2013-01-11 11:53:02 -06:00
Mike Duff
9adac72fba Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 65dd6c6f60 [formerly ed95eae2e3] [formerly 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]]
Former-commit-id: 2661145adf236b4fa5c186262fb5752eabdf600d [formerly 8313877a3a]
Former-commit-id: 660064ea6a
2013-01-09 12:02:21 -06:00
Dustin Johnson
683542813d Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]]
Former-commit-id: 2635e05723
Former-commit-id: 71e085b940 [formerly 885f315d30] [formerly db9b8d2b230d04c2984037f6535517c2201db20b [formerly 492cee4992]]
Former-commit-id: 7294d4c01e6fcf76d993e5993a213ccedb5d6fe1 [formerly b1c159fc7f]
Former-commit-id: b24ddaeb4e
2013-01-08 12:44:29 -06:00