Commit graph

47 commits

Author SHA1 Message Date
Steve Harris
900b9aadde Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]
Former-commit-id: 7fcf9f1cb2
2013-03-18 16:52:00 -05:00
Dustin Johnson
1b82ad0dc4 Issue #1794 Consolidate common filename filters into FilenameFilters class
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: ecb0d2c826 [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]
Former-commit-id: 43a9f608ef
2013-03-15 11:51:58 -05:00
Dave Hladky
160e1594b8 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]
Former-commit-id: 5dc454c7ef
2013-03-13 13:56:33 -05:00
Steve Harris
31c0a97dca 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: e12ed113ae
2013-03-13 09:50:28 -05:00
Dustin Johnson
48a96911c8 Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 71365cd945 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]
Former-commit-id: 1930183036
2013-03-13 08:39:08 -05:00
Dustin Johnson
33fe353252 Issue #1778 Watch for bandwidth configuration changes
Amend: Peer review comments

Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e

Former-commit-id: 4c7f7801fa [formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]
Former-commit-id: 794812fb23
2013-03-12 12:02:09 -05:00
Dustin Johnson
043f122356 Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd

Former-commit-id: 8107f76d98 [formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]
Former-commit-id: 547780f9a3
2013-03-05 11:39:42 -06:00
Dustin Johnson
c0a1ae396a Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions
Amend:
  Use isEmpty() where possible in BandwidthManager.

Change-Id: I85fe54982245e088f60dd33148aed72e6abfc9ec

Former-commit-id: 1161125c84 [formerly 28c97849800c624bdaa161f05777703ee2a510ac]
Former-commit-id: 54c3980cba
2013-03-04 14:55:50 -06:00
Dustin Johnson
cc0254ba03 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]
Former-commit-id: 88a9b953b6
2013-02-26 15:06:04 -06:00
Mike Duff
1365596d4d Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]
Former-commit-id: 086d24acc8
2013-02-25 15:53:55 -06:00
Mike Duff
b1a549a99f Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]
Former-commit-id: 81649d346a
2013-02-25 09:29:16 -06:00
Dustin Johnson
5031ae4d66 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: a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]
Former-commit-id: cb1380af90
2013-02-20 16:17:20 -06:00
Roger Ferrel
8264adc47d 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: 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]
Former-commit-id: dd05bc65be
2013-02-20 12:09:26 -06:00
Dustin Johnson
ca721863be 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: d8659e742e [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]
Former-commit-id: c8760e5699
2013-02-20 10:42:51 -06:00
Dustin Johnson
db3a9d8f19 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: 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]
Former-commit-id: 62a84aea76
2013-02-18 13:05:41 -06:00
Mike Duff
079ec4b6dd Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

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

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

Former-commit-id: 656601f272 [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]
Former-commit-id: f6a286da2d
2013-02-14 15:33:06 -06:00
Dustin Johnson
9783dc4d9f 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: dd8ca33fc4 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]
Former-commit-id: d143735ea8
2013-02-14 09:49:22 -06:00
Dustin Johnson
b4367903b0 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 4bcd75c091 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]
Former-commit-id: 19fd95d2c8
2013-02-12 11:59:45 -06:00
Dustin Johnson
e504a474f9 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: 8307af022c [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]
Former-commit-id: ef32853dc1
2013-02-11 14:21:57 -06:00
Steve Harris
30d38334cc 13.2.1-6 baseline
Former-commit-id: d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: a46e33f06e
2013-02-07 16:00:39 -06:00
Mike Duff
4400265394 Issue #1580 - Refactor events framework so EventBus is available from CAVE or EDEX.
Change-Id: If8d9c18108ca244b044b1ddc5a80e9e5de623c7a

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

Former-commit-id: cd381cb819 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]
Former-commit-id: febe492056
2013-02-05 14:07:30 -06:00
Dustin Johnson
b5f69e21d8 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: 3b20efeb7d [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]
Former-commit-id: 1a17e4a0f5
2013-02-04 09:00:33 -06:00
Steve Harris
6383bf8ed2 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: 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]
Former-commit-id: ec56acde81
2013-01-31 10:19:14 -06:00
Dustin Johnson
4465094fe9 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: 41c0ff85ff [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]
Former-commit-id: f88a5c1b95
2013-01-25 14:30:04 -06:00
Steve Harris
25fecb8b4f Merge branch '13.2.1_delivery' into development
Former-commit-id: f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]
Former-commit-id: 827611474f
2013-01-25 10:54:51 -06:00
Mike Duff
fbf92a6d06 Issue #1523 - Fix problem with legend keys.
Change-Id: Iea9cf5a95767b8c3a71ddc022757d9d5dda5a931

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

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: ffca969560 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]
Former-commit-id: 1bc6e7c2e4
2013-01-23 11:17:36 -06:00
Steve Harris
47cc08ac79 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Dustin Johnson
516ac1ab9a Issue #1519 Fix max latency calculations for adhoc queries
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

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

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

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

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

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

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