Commit graph

38 commits

Author SHA1 Message Date
Dustin Johnson
b6602f9468 Merge "Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO - Change new registry modes to explicitly list includes/excludes. - Add separate bandwidth manager creation capabilities for NCF and WFO. - Add deltaScript to add a "route" slot to subscriptions. - Remove unnecessary schemas from Spring files." into development
Former-commit-id: cb1380af90 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]
Former-commit-id: a9e976eed8
2013-02-20 16:17:20 -06:00
Roger Ferrel
acfccac971 Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools.
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f

Former-commit-id: dd05bc65be [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]
Former-commit-id: 8baa3b6df5
2013-02-20 12:09:26 -06:00
Dustin Johnson
d4afef2cab Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.

Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa

Former-commit-id: c8760e5699 [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]
Former-commit-id: d8659e742e
2013-02-20 10:42:51 -06:00
Dustin Johnson
f16c1507d0 Issue #1543 Use XML to represent retrieval
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor

Amend:
   Add call-through method to prepare for serialization.

Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d

Former-commit-id: 62a84aea76 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]
Former-commit-id: 437a168b50
2013-02-18 13:05:41 -06:00
Mike Duff
897262630c Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]
Former-commit-id: 0b044dba9c
2013-02-18 08:16:57 -06:00
Dustin Johnson
4be6c12ac6 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: 6e2f69939f [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]
Former-commit-id: 714ea1c8d8
2013-02-15 08:13:11 -06:00
Dustin Johnson
54dd90afdd Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: f6a286da2d [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]
Former-commit-id: 656601f272
2013-02-14 15:33:06 -06:00
Dustin Johnson
25faaa2af0 Issue #1543 Serialize DODS response rather than plugin data objects directly
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.

Amend:
   Peer review comments.
   Set retrieval status to failed when payload is null.

Change-Id: I458b13856302c8faceeef985c1c41115644520b7

Former-commit-id: d143735ea8 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]
Former-commit-id: dd8ca33fc4
2013-02-14 09:49:22 -06:00
Dustin Johnson
9f5b5f5346 Merge "Issue #1543 Clean up test files after changing to Spring transactions" into development
Former-commit-id: 583f76b366 [formerly add04e9858bcbd7a503c11606e1d4a820885f980]
Former-commit-id: 5152c8f857
2013-02-12 12:12:40 -06:00
Dustin Johnson
651c6d55c1 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 19fd95d2c8 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]
Former-commit-id: 4bcd75c091
2013-02-12 11:59:45 -06:00
Matt Nash
6405fa1eb1 Issue #1612 export entries in .classpath for use in other unit test projects
Change-Id: I516da05d33cbfaad54775e30ef5ccd9df4c7f40c

Former-commit-id: 6e59cf2c5a [formerly ed7a54ecc71d16810b3fbd5ebebd1dc62e1bfe82]
Former-commit-id: 24993b08eb
2013-02-12 10:24:53 -06:00
Dustin Johnson
0d548bd66f Issue #1543 Add testing of current OpenDAP type retrievals.
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.

Amend:
  Peer review comments.
  Change to use Spring transactions.

Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366

Former-commit-id: ef32853dc1 [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]
Former-commit-id: 8307af022c
2013-02-11 14:21:57 -06:00
Mike Duff
06ddb6cce7 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

Former-commit-id: 36909dd6c0 [formerly 1d3f9e0d5b32f96fc4eff47f040d5eb159a38d3c]
Former-commit-id: 1b1d00f8a9
2013-02-05 15:13:51 -06:00
Dustin Johnson
7b2adf535e Merge "Issue #1543 Add ability to save/read dods files back to net.dods" into development
Former-commit-id: 0ceb35c131 [formerly 062ed14d60a8b3d29650ce78fa449f69f40d413b]
Former-commit-id: df987e6204
2013-02-05 14:36:31 -06:00
Dustin Johnson
efe1bcc4b5 Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]
Former-commit-id: cd381cb819
2013-02-05 14:07:30 -06:00
Dustin Johnson
cf063000ca 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: 1a17e4a0f5 [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]
Former-commit-id: 3b20efeb7d
2013-02-04 09:00:33 -06:00
Steve Harris
c218786986 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: ec56acde81 [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]
Former-commit-id: 658bea377b
2013-01-31 10:19:14 -06:00
Dustin Johnson
e64e36ecf2 Issue #1501 Fix broken required latency calculations
Change-Id: If91a567b2a215ec039f5649b4a77939a8fd9b45a

Former-commit-id: 5830a98a51 [formerly 9788de6b75f727ea1c2d7c178081eeec16078362]
Former-commit-id: f361f5a6a1
2013-01-31 08:39:08 -06:00
Dustin Johnson
c8302eb9f8 Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: 4e9ecdf166 [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]
Former-commit-id: b0125d6d7e
2013-01-29 10:10:54 -06:00
Dustin Johnson
50bfcd3fbf 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: f88a5c1b95 [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]
Former-commit-id: 41c0ff85ff
2013-01-25 14:30:04 -06:00
Steve Harris
618cf868c5 Merge branch '13.2.1_delivery' into development
Former-commit-id: 827611474f [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]
Former-commit-id: f673583915
2013-01-25 10:54:51 -06:00
Mike Duff
478ec72102 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

Former-commit-id: c06ed9f9dc [formerly c625174317778f673a8f3b5062e1bd7832b70ed4]
Former-commit-id: ba5014b162
2013-01-24 12:39:12 -06:00
Mike Duff
712862d96f Issue #1357 - Remaining stats items implemented.
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: 1bc6e7c2e4 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]
Former-commit-id: ffca969560
2013-01-23 11:17:36 -06:00
Dustin Johnson
504268f0f3 Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]
Former-commit-id: 6c1818d544
2013-01-23 08:06:52 -06:00
Steve Harris
cf384edfbb Merge branch '13.2.1_delivery' into development
Former-commit-id: 1af055a04b [formerly 920b282de84def082dac82832d80e67f7bff2b19]
Former-commit-id: 11b9bfc187
2013-01-22 16:45:48 -06:00
Dustin Johnson
3ec05a5a9c 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: 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]
Former-commit-id: 557de162b0
2013-01-22 11:45:18 -06:00
Steve Harris
89f3120c0c 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: 407d73a04f [formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]
Former-commit-id: 2c9c6b7dde
2013-01-18 10:52:29 -06:00
Dustin Johnson
b1ce19e41d Issue #1412 Check file last modified times each time role data is requested
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa

Former-commit-id: 037dabb683 [formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]
Former-commit-id: 74d5a70c30
2013-01-17 12:48:01 -06:00
Roger Ferrel
972db12324 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: 1e492b81ff [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]
Former-commit-id: 1cd076671c
2013-01-16 16:53:29 -06:00
Dustin Johnson
c12b46027f 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: 19d3a14d4f [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]
Former-commit-id: b627dfc054
2013-01-16 12:21:11 -06:00
Dustin Johnson
99f8d40bed Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]
Former-commit-id: 3d74a68e94
2013-01-15 10:18:14 -06:00
Mike Duff
329a010b07 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: 8411a46e3e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]
Former-commit-id: 279729e88e
2013-01-11 14:38:34 -06:00
Richard Peter
58242a600c Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: a2c3db2ee7 [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]
Former-commit-id: 32e5d79e7a
2013-01-11 12:37:05 -06:00
Dustin Johnson
3e1878c5f9 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: c4068d27bf [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]
Former-commit-id: 7716f1baa9
2013-01-11 12:23:15 -06:00
Dave Hladky
440de708df Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: 002ac2eb41 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]
Former-commit-id: 5cf3eee426
2013-01-11 11:59:36 -06:00
Dustin Johnson
8473eb60fb 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: 446f65776e [formerly 797f570e28086b43b5d851275fba457c5920f57e]
Former-commit-id: 4ae1a9645c
2013-01-11 11:53:02 -06:00
Mike Duff
f41d525fa3 Issue #1420 - Rules Peer review comments
Former-commit-id: 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]
Former-commit-id: 4c63333a96
2013-01-09 12:02:21 -06:00
Dustin Johnson
1975cd0442 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: 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]
Former-commit-id: 6a90779214
2013-01-08 12:44:29 -06:00