Commit graph

1039 commits

Author SHA1 Message Date
Richard Peter
787b2e3afd Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

Former-commit-id: 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 5b2650599d [formerly 9a0177861f [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]]
Former-commit-id: 5b2650599d
Former-commit-id: 0b51936566 [formerly ea806139d3] [formerly 34da74ced85f0f692350cc266348ad7532e0abff [formerly 4deaf372a1]]
Former-commit-id: a69b7f2df6d702e8f84d343464a46a7e090af1c1 [formerly e964d248fe]
Former-commit-id: 294914b403
2013-02-26 16:01:25 -06:00
Dustin Johnson
b24c3f23c7 Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7

Former-commit-id: 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 1d9690f299 [formerly 8038b840d8] [formerly 7852f88352] [formerly 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]]
Former-commit-id: 88a9b953b6
Former-commit-id: c23b8a58c3 [formerly 94300e0c1d] [formerly 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]]
Former-commit-id: 9b2a38cdff53a695ca327ed0c3edd1084fed67fd [formerly 2d6df74b67]
Former-commit-id: 6bb570ce5c
2013-02-26 15:06:04 -06:00
Nate Jensen
02b44369f4 Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
Former-commit-id: eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly eb2e9f64f4 [formerly 15c4c4dfa0] [formerly b062299796] [formerly 36d4eff2c6 [formerly b062299796 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5853f48992 [formerly b173d34ba9] [formerly 6b86c197517307ff2a80b25f90eb928605a06ecd [formerly 5c33098315]]
Former-commit-id: 3e677462839f8afaa67be1cf2099dee3fdc6466c [formerly c06d4abcee]
Former-commit-id: 360b33b854
2013-02-26 13:53:40 -06:00
Matt Nash
ab25be3e1c Issue #1668 add gsd pattern to allow for their plugins to be deployed
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6

Former-commit-id: 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 9dc4390b7e [formerly 41bbd4cf2d] [formerly a2fb0db684] [formerly 051b36ad73 [formerly a2fb0db684 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]]
Former-commit-id: 051b36ad73
Former-commit-id: 9ac60409d6 [formerly 32096feba8] [formerly ae09dddec53fb271e50dd90fd45b73f94ff690be [formerly b1fe380c44]]
Former-commit-id: f1dae5c4963ec5df64921535a8f7825033676c4f [formerly 1c51407ffd]
Former-commit-id: 2841c495af
2013-02-26 13:29:04 -06:00
Dustin Johnson
1b880d1178 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly 722e41b8b0 [formerly d58d28c636 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]]
Former-commit-id: 722e41b8b0
Former-commit-id: e6d447b00d [formerly 219e882fc5] [formerly 1fb58b752e38ec55f49ddf711fd9f47baf778025 [formerly cf86c92fad]]
Former-commit-id: 2e5f667d7ca6b4eeabba4faa28273511e86c137d [formerly b62631b9d1]
Former-commit-id: fa87f70100
2013-02-26 11:32:03 -06:00
Steve Harris
86c1edf4ea Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly 650db426b9 [formerly cd99e680bb] [formerly b50e384a0f] [formerly e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]]
Former-commit-id: e8135b9c14
Former-commit-id: e4b9ef2cd3 [formerly 901cbbf56d] [formerly 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]]
Former-commit-id: 2360d951adc310ab576e9dbbb7077bb09c817c57 [formerly 1d8b6e0256]
Former-commit-id: 108abd5e69
2013-02-25 16:05:22 -06:00
Steve Harris
9d9a17aa64 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]]
Former-commit-id: 6ec9e73035
Former-commit-id: f30d1cdf87 [formerly e46625f8f2] [formerly bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]]
Former-commit-id: 8958c8255ceab6eb6c8e58c5cb4c8a688e5de950 [formerly 140ae3191c]
Former-commit-id: 9db68d0585
2013-02-25 15:58:48 -06:00
Bryan Kowal
e9cbfb8c57 Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 0d2262c0bf [formerly b05073fbe3 [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: f4bf7e1adb [formerly f8c920c6cd] [formerly 090c61777cb5dad1fa90214f62e271692c5b167e [formerly 36a887416f]]
Former-commit-id: 4279afad443b9b6aab6051e4b7a738fe37ac5e91 [formerly ebe04d4919]
Former-commit-id: e38658e939
2013-02-25 11:30:13 -06:00
Mike Duff
d1fec7bb15 Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]]
Former-commit-id: 81649d346a
Former-commit-id: 5439b30b6a [formerly 01ef273417] [formerly 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]]
Former-commit-id: 0b55db4b6b45148de1eef1eb4f0dbf9090315261 [formerly a92492ed07]
Former-commit-id: 383f5c075e
2013-02-25 09:29:16 -06:00
Steve Harris
02f04a926e 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]]
Former-commit-id: 8a64f142e5
Former-commit-id: 30efc4c86a [formerly 05eb25f124] [formerly ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]]
Former-commit-id: 1fe55774d4f2229cf3fdf3a4a342eab88f5b63cd [formerly 1ba778753f]
Former-commit-id: 9da8db0212
2013-02-25 10:24:53 -05:00
Steve Harris
dbaeb28c82 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]]
Former-commit-id: 3d115ed3be
Former-commit-id: f2428e968a [formerly 370ed98038] [formerly 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]]
Former-commit-id: 6be2b60d013b857004e97817b3188f6eb4ae78f5 [formerly 2a2a9e03b7]
Former-commit-id: a43233f8c2
2013-02-25 10:18:36 -05:00
Dustin Johnson
3b3b786990 Issue #1543 Make DAOs public
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 0743782772 [formerly 06b7697553 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]]
Former-commit-id: 0743782772
Former-commit-id: 637c7e62c2 [formerly a1df296e80] [formerly 0129926124bc6953a319174f4ae9c67d11da1444 [formerly 4e87912a9c]]
Former-commit-id: 965e4e0af9cf9b0047bca78a7973aae1c9c8e32a [formerly 0d9f121548]
Former-commit-id: 2e513ab5ac
2013-02-22 12:22:43 -06:00
Bryan Kowal
18b7aaed49 Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]]
Former-commit-id: d5c8b82941
Former-commit-id: ec53fa98cd [formerly 53b9e69868] [formerly e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]]
Former-commit-id: e900cecc385d0b35cf2613204f84c8aac131bc81 [formerly fd17273cb2]
Former-commit-id: dd7eda15aa
2013-02-22 09:28:37 -06:00
Steve Harris
34d0f59592 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c]
Former-commit-id: b5d9e75b95
2013-02-21 15:41:39 -06:00
Bryan Kowal
55b55a1255 Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6a47017449 [formerly b2a0a7c148] [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]]
Former-commit-id: 302b1a5ae96498f9e93f50ccd303b89ce6085fa5 [formerly 2a21f2624b]
Former-commit-id: b88a24574b
2013-02-21 13:55:28 -06:00
Nate Jensen
9a8f71c7a8 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
Former-commit-id: ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 7dbeeb2684 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]]
Former-commit-id: c6896b5676
Former-commit-id: b423cd4d70 [formerly 533deac8d0] [formerly 97c5442369f13721659c1b0c23d03bc01ac6815a [formerly 4f4932b014]]
Former-commit-id: 77cef9f4ba08ffa9f29d10832751a4bf7db8f0f2 [formerly 0f92e92c18]
Former-commit-id: d4268d6086
2013-02-21 11:47:00 -06:00
Nate Jensen
a29dcc879f Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]]
Former-commit-id: 73f53bd513
Former-commit-id: e19664ab18 [formerly 6f9d3f55e5] [formerly 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]]
Former-commit-id: 280cd5c23fc512c656015c651483ee802f2f1629 [formerly 767596401f]
Former-commit-id: 98e5133a1c
2013-02-21 11:41:52 -06:00
Steve Harris
067dfcb980 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 96c7269df0 [formerly 0569ff413d] [formerly c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]]
Former-commit-id: a43ccc92cdffebafcecdfdadcfc25825beb32b12 [formerly 654f15be5c]
Former-commit-id: 07e4e4c8fb
2013-02-21 09:36:59 -05:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Dustin Johnson
2a9f20fca7 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: 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]]]
Former-commit-id: cb1380af90
Former-commit-id: 18cfc1ee4d [formerly f552967bf3] [formerly 48d8590ebfaa96f41ee4b9def3d4c9a8b17d1c3c [formerly 5031ae4d66]]
Former-commit-id: 8a3326929ccb7815ac1878648083e7db49810bb1 [formerly d62153b1b4]
Former-commit-id: a5a2f437f9
2013-02-20 16:17:20 -06:00
Dave Hladky
94b8025274 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: f439b63316 [formerly 261d00c544] [formerly 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]]
Former-commit-id: bcadc59b9fd827ba70895359ecdc846ddaa9d826 [formerly cd74938355]
Former-commit-id: 87cfb35394
2013-02-20 16:13:08 -06:00
Ben Steffensmeier
7a930f49eb Issue #1628 clean up Inflaters used by HttpClient.
Former-commit-id: 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly e2efad85fe [formerly ef2dd2a031 [formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]]]]
Former-commit-id: e2efad85fe
Former-commit-id: 9d34dce3de [formerly 0f1057cb3d] [formerly 8365e04958c1ccf70f03afee22501ef446beba5f [formerly 2debab14f5]]
Former-commit-id: e533c5fbc2db6246d3a0e81135af9a09ee340782 [formerly cc0dcc8eae]
Former-commit-id: 63cf7e3cb9
2013-02-20 12:58:13 -06:00
Roger Ferrel
0ab8a42f96 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: c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly dd05bc65be [formerly 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]]]
Former-commit-id: dd05bc65be
Former-commit-id: 672a979183 [formerly e47c91eda7] [formerly bb8e979b980b2c5128f11b8e520f639e237ea72a [formerly 8264adc47d]]
Former-commit-id: 7942c7b0e437e39d63fc331211541bf727eae1cf [formerly 70dae3453a]
Former-commit-id: cdbebf0743
2013-02-20 12:09:26 -06:00
Dustin Johnson
6924e0f530 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: 597908f34d [formerly d4afef2cab] [formerly d8659e742e] [formerly 597908f34d [formerly d4afef2cab] [formerly d8659e742e] [formerly c8760e5699 [formerly d8659e742e [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]]]
Former-commit-id: c8760e5699
Former-commit-id: 0c7c2a6abd [formerly 5a8b6459d4] [formerly f672d4337c7763a3c1b36a4e134928216fc2dff2 [formerly ca721863be]]
Former-commit-id: 9272577337c7736f0a166437a92ddcb0a5d60072 [formerly 5ffa5f410e]
Former-commit-id: 2565df8435
2013-02-20 10:42:51 -06:00
Ben Steffensmeier
d114d01dff Issue #1598 fix GridParamInfo keys.
Former-commit-id: 4370018cbf [formerly 7d4b065a23] [formerly 1ab9f7bd1f] [formerly 4370018cbf [formerly 7d4b065a23] [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 1ab9f7bd1f [formerly 33da1c48a76b468b9fee4e05de835295c7393672]]]]
Former-commit-id: c1b8ceecf1
Former-commit-id: 9c889bcc37 [formerly cde7275a2a] [formerly a3eea6c6923a0758fd9d051e07105c75b85536a9 [formerly 48e6ffe392]]
Former-commit-id: cb56abfb3927a8b23efd564d2525ac33c634d5ae [formerly c6c33c4b93]
Former-commit-id: 2deb16071d
2013-02-19 14:06:26 -06:00
Steve Harris
b7446ac966 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]]
Former-commit-id: d123c044c3
Former-commit-id: bca88ba9c7 [formerly 81f1fb83a0] [formerly d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]]
Former-commit-id: cb9ccc383baf32e35d0325fdfa001bdd7a62b969 [formerly 5a33182da5]
Former-commit-id: 77a66598fe
2013-02-19 12:22:00 -06:00
Dustin Johnson
6b6de2a7af Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
Amend:
   Use ref syntax with uri.

Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062

Former-commit-id: 8532c28461 [formerly 2a588688b1] [formerly cc598094fa] [formerly 8532c28461 [formerly 2a588688b1] [formerly cc598094fa] [formerly 116809346b [formerly cc598094fa [formerly 66fe560026848357ae165a675be9818da719675d]]]]
Former-commit-id: 116809346b
Former-commit-id: 8d32c1ee00 [formerly 5ff6387368] [formerly fa68e8e6e2aeab2fdd4a5f732b9524d93c0d5e1a [formerly 3585482cad]]
Former-commit-id: cb4d50d60ff28726f4ff6d296a4168072745f5fe [formerly 992a02d000]
Former-commit-id: 0f1fcc9b5b
2013-02-18 15:47:17 -06:00
Richard Peter
62c839b9d3 Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development
Former-commit-id: 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly f364af584d [formerly 77157e3c6c [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]]
Former-commit-id: f364af584d
Former-commit-id: 24f36419b3 [formerly d42a0b9f0d] [formerly 6929b91f2a2d234b16abab0c3bdda8ad2a62bffb [formerly 623020926e]]
Former-commit-id: 7ced2fcdc916a6d04aca4290ddc5c01674f5943c [formerly 3b1a6d4c30]
Former-commit-id: 33aa90c3de
2013-02-18 15:36:41 -06:00
Dustin Johnson
5b3735a110 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: dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly 62a84aea76 [formerly 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]]
Former-commit-id: 62a84aea76
Former-commit-id: 3110a88e0c [formerly 6f94c035e8] [formerly 9b75194ff411af8419ede2a4c14daf3b155c88ab [formerly db3a9d8f19]]
Former-commit-id: 731555484a02802af631aec74dd42c443654887f [formerly f6257b20ea]
Former-commit-id: 191ec3b408
2013-02-18 13:05:41 -06:00
Ben Steffensmeier
5bff6447ad Issue #1598 Make GridParamInfoLookup filter on extension.
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly d2e17d1473 [formerly 63a725718d [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]]
Former-commit-id: d2e17d1473
Former-commit-id: f945303603 [formerly 47090eccc1] [formerly 11155351011bccb8beb1a89d0e39e1bd4e8881b5 [formerly 5ada0b2c2a]]
Former-commit-id: 7456cec353f617072e04053d577b85a01d0e8392 [formerly d472a5d48e]
Former-commit-id: bc3be10852
2013-02-18 10:36:47 -06:00
Richard Peter
f68b77486c Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 9c0ff50ba0 [formerly 4f3d9ab931] [formerly 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]]
Former-commit-id: 97a2343cd226d8cc1142caa36a35e45f736cc748 [formerly 17dfe3e7fa]
Former-commit-id: 1015d581cb
2013-02-18 09:35:53 -06:00
Steve Harris
0b53108cbe 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440 [formerly 8cffb55371] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7]
Former-commit-id: 32ad300b47
2013-02-18 09:09:41 -06:00
Nate Jensen
6bbeb0d5d4 Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development
Former-commit-id: 2936633216 [formerly eb8e87dfe2] [formerly 88b665c09a] [formerly 2936633216 [formerly eb8e87dfe2] [formerly 88b665c09a] [formerly 52a0673961 [formerly 88b665c09a [formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]]]
Former-commit-id: 52a0673961
Former-commit-id: 534de45640 [formerly d39e16e532] [formerly 25d08da5f1efa78666aeb217e6b5fc7b031c3237 [formerly d648e77fa5]]
Former-commit-id: 52cf1c30d145999192aaf528f896b9a032cc3c00 [formerly f41ef80162]
Former-commit-id: 92148eca41
2013-02-18 09:07:18 -06:00
Steve Harris
77dbde9e45 13.2.1-8 baseline
Former-commit-id: 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 1af911d098 [formerly da707ff25c] [formerly 27d88edcb9] [formerly 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]]]
Former-commit-id: 535a9402a7
Former-commit-id: 825a99770d [formerly 58bafc0068] [formerly 0a9388f77add45c1702ce16113b0c20068e2d223 [formerly a68ce64f45]]
Former-commit-id: 0d9c5ea952e6d4f898bb127acdeb6807009e309c [formerly 7b6e374314]
Former-commit-id: 933e9f3f75
2013-02-18 09:23:06 -05:00
Mike Duff
833e5aaf24 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 6628aea419 [formerly 3e59308771] [formerly 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]]
Former-commit-id: ee93310e9d4290c2cb2fd40f2f7c40a19a16c41c [formerly 72f6e95a67]
Former-commit-id: 2aee18ea9d
2013-02-18 08:16:57 -06:00
Richard Peter
3ba74383cd Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
Former-commit-id: 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly 69897b3aa2 [formerly b3e2ca7b30] [formerly a40ae4d8b2] [formerly a6fa92923f [formerly a40ae4d8b2 [formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]]]
Former-commit-id: a6fa92923f
Former-commit-id: 720f324789 [formerly 774ea0ede6] [formerly 8f5d31cba589ac5b371ec575b4cd127eeae8019e [formerly 5936f671ce]]
Former-commit-id: 01c4bd0a41aa710880dcc6ad9ca340bc657994fc [formerly b5706ca6cf]
Former-commit-id: 107393f436
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
84ce2e9d25 Issue #1614 Cache LatLonReprojection results.
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338

Former-commit-id: a292819eb9 [formerly a10e7edaeb] [formerly e53416937e] [formerly a292819eb9 [formerly a10e7edaeb] [formerly e53416937e] [formerly feb2e98e58 [formerly e53416937e [formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]]]
Former-commit-id: feb2e98e58
Former-commit-id: be742d7e4a [formerly 5b1acfdeb3] [formerly 0b4c872cdc5305e70aed22e407e276f4bad6a3f4 [formerly 6b53511f9e]]
Former-commit-id: c9b1ae28723d4471f6d5c5cf0e7bd8f1c599624b [formerly 18d64138d3]
Former-commit-id: 3da1ee4eca
2013-02-15 14:24:22 -06:00
Brad Gonzales
158de2a276 Issue #1615 Changed radar header names to match other header names.
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a

Former-commit-id: 65f1094da1 [formerly 1ddcd8b3a8] [formerly a9012633a1] [formerly 65f1094da1 [formerly 1ddcd8b3a8] [formerly a9012633a1] [formerly 961f51e91f [formerly a9012633a1 [formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]]]
Former-commit-id: 961f51e91f
Former-commit-id: 58044639cb [formerly 1501ed6deb] [formerly ff618ebf54df30a7f76fed1cf66536cffe14e098 [formerly 0dda5f784e]]
Former-commit-id: 31bdd15d5f7010aeac9ab5d93a8a04f0b1ec8861 [formerly 36fdf25480]
Former-commit-id: b2e457022d
2013-02-15 14:02:03 -06:00
Nate Jensen
879a900b70 Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
Former-commit-id: 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly 8722cf18fa [formerly 1b1e468e1f] [formerly f748815e22] [formerly f79f7db348 [formerly f748815e22 [formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]]]
Former-commit-id: f79f7db348
Former-commit-id: 218d26f676 [formerly d6ba283efc] [formerly 46c56447c7896eda732cfe5904eeba4f40dbdfdd [formerly a60cf277bc]]
Former-commit-id: 7e273a1af1c051cdb183b6e89e8ce66cc2aff3ba [formerly 1501b0f1e3]
Former-commit-id: 7bcb70160d
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
2e69059ebf Issue #1614 Refactor data access framework to use single request.
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798

Former-commit-id: d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly d35b79d537 [formerly e771076275] [formerly 1393f3e3cf] [formerly 0933a5f596 [formerly 1393f3e3cf [formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]]]
Former-commit-id: 0933a5f596
Former-commit-id: a0f06eff69 [formerly 91bbdc3337] [formerly 133a0064f1bda2cc9d635ce7bed097b681dd8dd1 [formerly f0f3c71d50]]
Former-commit-id: 7663061c777f8924db2896bd3ceb46d59c111226 [formerly f868f66f76]
Former-commit-id: e6fc131343
2013-02-15 11:39:56 -06:00
Ron Anderson
46248d1c10 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 9156b9ffe8 [formerly dc7c9edb87] [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: 12f2ac0171 [formerly d69d628450] [formerly 05e20f4050e6fac5a3d4a69d2e1baa354ff73eaf [formerly e952a4f179]]
Former-commit-id: af2b3c67dc766d6b95ad299a4853ebd80437f7e4 [formerly 45627edcc7]
Former-commit-id: 80df624bb3
2013-02-15 09:03:41 -06:00
Richard Peter
909ef9fced Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
Former-commit-id: cb0efa78cf [formerly dcd4761b54] [formerly eb00310ef9] [formerly cb0efa78cf [formerly dcd4761b54] [formerly eb00310ef9] [formerly b54ec2b59e [formerly eb00310ef9 [formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]]]
Former-commit-id: b54ec2b59e
Former-commit-id: 17bd230bc7 [formerly ad4110a73f] [formerly 4491affe182849536a3ad656388587312841db33 [formerly 0bab06709b]]
Former-commit-id: a0d3c08a70c62f11d40e4941701a75c77c9a4c20 [formerly b82e1249bd]
Former-commit-id: 1b8a4b159d
2013-02-15 08:44:02 -06:00
Richard Peter
9d994d690c Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
Former-commit-id: 1fc9f6bae6 [formerly bd91d2b8be] [formerly 5a5a5ba855] [formerly 1fc9f6bae6 [formerly bd91d2b8be] [formerly 5a5a5ba855] [formerly d905313941 [formerly 5a5a5ba855 [formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]]]
Former-commit-id: d905313941
Former-commit-id: c69ddc3064 [formerly 015b51082d] [formerly 3f33ab2ec4e4316abb5bbf4cb049c3da5a454b3f [formerly 2d8327e76f]]
Former-commit-id: f7113be445f98be1e03129cb06eb2393a96eb351 [formerly 8cac928d13]
Former-commit-id: 424d5a62fd
2013-02-15 08:31:33 -06:00
Dustin Johnson
5f7a161077 Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41

Former-commit-id: c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly c638eca350 [formerly 4be6c12ac6] [formerly 714ea1c8d8] [formerly 6e2f69939f [formerly 714ea1c8d8 [formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]]]
Former-commit-id: 6e2f69939f
Former-commit-id: 72cb5b436b [formerly d0ecd69456] [formerly 11d3a956bd7f1cc9a0583c0a5584b6470fe49630 [formerly 1ef440f8ee]]
Former-commit-id: 7cc6a0aaad6eada373e1fab36c85062f70d96699 [formerly f14bedec28]
Former-commit-id: 12d4b055f6
2013-02-15 08:13:11 -06:00
Brad Gonzales
a2adb304f6 Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
Amend: Corrected comment in convertPluginNameToDataType.sh

Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18

Former-commit-id: f8aacc2e50 [formerly 6a0e9c331b] [formerly 03dd42463e] [formerly f8aacc2e50 [formerly 6a0e9c331b] [formerly 03dd42463e] [formerly dfef89ee64 [formerly 03dd42463e [formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]]]
Former-commit-id: dfef89ee64
Former-commit-id: 3989a20f06 [formerly 936facbe86] [formerly 50e1b1845799292ee1dd0352a97bb78fa276ca05 [formerly e495a5f663]]
Former-commit-id: 2bfc6e46050dfd24313d00a3c64291fa8ea5ffbe [formerly 5e69b61418]
Former-commit-id: 3d92be6fc1
2013-02-14 17:34:55 -06:00
Dustin Johnson
c84db93145 Issue #1595 Fix expired subscription update retrieval time scheduling
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7

Former-commit-id: 632586a6d2 [formerly 54dd90afdd] [formerly 656601f272] [formerly 632586a6d2 [formerly 54dd90afdd] [formerly 656601f272] [formerly f6a286da2d [formerly 656601f272 [formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]]]
Former-commit-id: f6a286da2d
Former-commit-id: 2e40a0e908 [formerly 158ce1fe5b] [formerly fb3f73098ac1d1c9b79e611ae10bc7164b395903 [formerly 776581bc55]]
Former-commit-id: 4e158717754c918dfde1fb1f4e21727ad51c745b [formerly 0614bd08f7]
Former-commit-id: 4466e63c84
2013-02-14 15:33:06 -06:00
Nate Jensen
d1a3b6e935 Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
Former-commit-id: ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly ed195ae9e4 [formerly 5526ee7e8d] [formerly 1144f08e59] [formerly a3e0bf09ab [formerly 1144f08e59 [formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3724151397 [formerly b4aea0385c] [formerly b34b2a8b576d4d26a79a47c3f0f154dd8bdc4ee2 [formerly 3f5b8b56ef]]
Former-commit-id: 91f25cfaf95919e31517e76aa9628851f20000cc [formerly 2422d17df3]
Former-commit-id: 498c622823
2013-02-14 15:05:14 -06:00
Dave Hladky
1edb294675 Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 65f4e442bc [formerly 2655952304] [formerly 7b3a310f67] [formerly 65f4e442bc [formerly 2655952304] [formerly 7b3a310f67] [formerly 381aec5976 [formerly 7b3a310f67 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]]]
Former-commit-id: 381aec5976
Former-commit-id: ba8eb2b557 [formerly a17dee033a] [formerly a3bb927b21e71fee86b6ae81fd130425b9672bcf [formerly 5c66cbcd27]]
Former-commit-id: 25c1baf457c2a792817040f1fcfe3385744bd69e [formerly 7dad108a93]
Former-commit-id: 3dd2314369
2013-02-14 13:58:32 -06:00
Ben Steffensmeier
e09c344878 Issue #1614 allow locationNames for grid data access
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2

Former-commit-id: 31605a14aa [formerly ef7addb005] [formerly ab319bd3a8] [formerly 31605a14aa [formerly ef7addb005] [formerly ab319bd3a8] [formerly 9b4de367e3 [formerly ab319bd3a8 [formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]]]
Former-commit-id: 9b4de367e3
Former-commit-id: fb7100ddc2 [formerly efaddb710c] [formerly a85d7d1d1a99549985dadde8efd31a21ab2de327 [formerly 0995024482]]
Former-commit-id: f063995b2a9e3a385f9b1073cc083378abfc43fc [formerly aecc5a69e9]
Former-commit-id: 2bcf3749ce
2013-02-14 10:07:01 -06:00
Dustin Johnson
cca5e664c4 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: 0bdaf0babe [formerly 25faaa2af0] [formerly dd8ca33fc4] [formerly 0bdaf0babe [formerly 25faaa2af0] [formerly dd8ca33fc4] [formerly d143735ea8 [formerly dd8ca33fc4 [formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]]]
Former-commit-id: d143735ea8
Former-commit-id: 018faeb591 [formerly 6f821ed8c9] [formerly ba20e1bd90048ad833da2d88ebbec80e0486dca1 [formerly 9783dc4d9f]]
Former-commit-id: c8bed06596d9d427b321f153a9723a4d98817a9a [formerly 922da948eb]
Former-commit-id: 1d80262cf9
2013-02-14 09:49:22 -06:00