Commit graph

759 commits

Author SHA1 Message Date
Roger Ferrel
7c6bd5aeb0 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 0982485efe [formerly 70bd9aafa7] [formerly 4deb731bd0] [formerly b421c97d86 [formerly 4deb731bd0 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]
Former-commit-id: b421c97d86
Former-commit-id: bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57]
Former-commit-id: 0deb290c24
2013-03-11 13:00:44 -05:00
Nate Jensen
5f343a50ae Issue #1773 log publish times
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85

Former-commit-id: 8a5ebbb9c9 [formerly 5d9778a8d6] [formerly 5e3d6df7e0] [formerly 5c59a61cef [formerly 5e3d6df7e0 [formerly 392feade3f36680edcdb135f7c061be172210c26]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68]
Former-commit-id: 21863c5db5
2013-03-07 16:49:40 -06:00
David Gillingham
266c316c9c Issue #1447: Implement active table fetching, make bug fixes
to active table sharing from testing.

Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d

Former-commit-id: c30aefd889 [formerly 75e82d9fca] [formerly 95f8074c97] [formerly 0a79d08dd8 [formerly 95f8074c97 [formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f]
Former-commit-id: 94bccc87a3
2013-03-06 14:23:00 -06:00
Dustin Johnson
513f990a00 Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
Former-commit-id: cfae194f9b [formerly 21abece1f2] [formerly d4c6c29f5f] [formerly 3eddb2d286 [formerly d4c6c29f5f [formerly 6fd60728a421630cea913d11db02b48f7940554e]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2]
Former-commit-id: b88a1eefc1
2013-03-05 13:32:04 -06:00
Steve Harris
7ff64bf8cc Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 3ec20c1689 [formerly 61a19a460b] [formerly 305dd72969] [formerly 57f42761d7 [formerly 305dd72969 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]
Former-commit-id: 57f42761d7
Former-commit-id: 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62]
Former-commit-id: b423579e4a
2013-03-05 12:27:49 -06:00
Mike Duff
e71d15f640 Issue #1752 - Lock down user admin dialog
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb

Former-commit-id: ec9f3ea4a1 [formerly 9d99eea617] [formerly 6809cb6f80] [formerly 193cf1e54f [formerly 6809cb6f80 [formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]
Former-commit-id: 193cf1e54f
Former-commit-id: 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd]
Former-commit-id: af84910ac6
2013-03-05 11:26:54 -06:00
Steve Harris
aabd5cd51f 13.3.1-5 baseline
Former-commit-id: e4a1c61ad5 [formerly 8123d5ac45] [formerly a89221c75b] [formerly e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]]
Former-commit-id: e26f7eb151
Former-commit-id: 96eeb29b073d8e7bf413ace53284a7d3f9fd8170 [formerly a40c9136fe]
Former-commit-id: a240379588
2013-03-05 10:47:06 -06:00
Steve Harris
4bfbb518c0 13.3.1-4 baseline
Former-commit-id: 9066d511fe [formerly d79303de13] [formerly 8c0b90f292] [formerly 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]]
Former-commit-id: 2edca90902
Former-commit-id: c3fe7088594b70139dad19673128f3fd665d1be1 [formerly 5e55ded3a9]
Former-commit-id: 3e0614b43a
2013-03-05 10:39:59 -06:00
Richard Peter
c7a4dcede6 Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
Former-commit-id: 3cc3648b9b [formerly e74f6074e7] [formerly 070f62d08e] [formerly 784cd2145f [formerly 070f62d08e [formerly 01d727795063ff365f3209f44c223c707c3942ab]]]
Former-commit-id: 784cd2145f
Former-commit-id: 63aff6583f8761a1de816d6c0659c2736bd51159 [formerly 180540eb47]
Former-commit-id: a4bf42628a
2013-03-04 17:48:05 -06:00
Dave Hladky
f47935a03c Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: d0cfd09209 [formerly 22ebfe0ecb] [formerly 680317d9c4] [formerly fc36146f48 [formerly 680317d9c4 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 88439cd2618a1c23c44807b5d72302de6137417a [formerly 1260b40307]
Former-commit-id: 0f3c9ba997
2013-03-04 17:41:11 -06:00
Steve Harris
8d3a082908 Issue #1744 - Revert "Issue #1744 fix deadlock"
This reverts commit 91d577f4db [formerly c5600acf79] [formerly cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]] [formerly f4cccabc07] [formerly 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]].


Former-commit-id: f14f5aeb48 [formerly 7ffb42d6e6] [formerly 28391884a7] [formerly fcb48a7280 [formerly 28391884a7 [formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]]
Former-commit-id: fcb48a7280
Former-commit-id: b5f56d7e152dca42f3283ef75e9eb4904563dd94 [formerly 9e87721b85]
Former-commit-id: f70ff93d2c
2013-03-04 13:03:19 -06:00
Steve Harris
9eeda5c82e Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
This reverts commit 49fc025594 [formerly 348f5f0f41] [formerly 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]] [formerly 35007e0460] [formerly eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]].


Former-commit-id: 702cec08bd [formerly 870972fb90] [formerly 88e633934d] [formerly bba410a330 [formerly 88e633934d [formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]]
Former-commit-id: bba410a330
Former-commit-id: 537868d2ef13d960b8aa433851e48e3b6ee200fc [formerly 7d2286aea7]
Former-commit-id: ee2452f5d3
2013-03-04 13:02:32 -06:00
Nate Jensen
ce0fb925d0 Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
Former-commit-id: 64d504df91 [formerly 6bf2eefa2a] [formerly a90a2fe857] [formerly 677908868e [formerly a90a2fe857 [formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]]
Former-commit-id: 677908868e
Former-commit-id: aee05b7e732da38b5ee08c9a38d44908e5c23f93 [formerly 216e3d6ad3]
Former-commit-id: 75366a9e5a
2013-03-01 13:43:50 -06:00
David Gillingham
3b9b6e1df6 Issue #1447: Initial commit of VTEC table sharing functionality: port A1 changes to
VTECTableSqueeze, port requestAT/sendAT, re-port ingestAT/MergeVTEC, some minor bug fixes to
serverConfig.py, project configs.

Change-Id: Ibecb0aad913845224be1b7dd713e9fefef19d510

Former-commit-id: e2a7d7a350 [formerly ca81ae4a71] [formerly 50744c1f92] [formerly 9351f33c1c [formerly 50744c1f92 [formerly 1e72fe30d97504f70352a181de35805a197e50f4]]]
Former-commit-id: 9351f33c1c
Former-commit-id: 4b11b2a5ba7daa34582110049c00325dd999edb7 [formerly 77a3f33fd5]
Former-commit-id: 622700dee9
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
9eb0c3e778 Issue #1731 Optimize construction of scan resource.
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b

Former-commit-id: f505cda0bf [formerly b0870c55f6] [formerly 86b9a4d8c2] [formerly 9263ff1846 [formerly 86b9a4d8c2 [formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]]
Former-commit-id: 9263ff1846
Former-commit-id: 33c36155057aba55daf29a51f9519c3aef6b6940 [formerly 5a149c5dfa]
Former-commit-id: 8f4c2f2a39
2013-03-01 11:03:11 -06:00
Nate Jensen
49fc025594 Issue #1744 actually fix deadlock this time
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb

Former-commit-id: eefa0d8e87 [formerly 3dc69632c1] [formerly 8c84bc5fbb] [formerly 35007e0460 [formerly 8c84bc5fbb [formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]]
Former-commit-id: 35007e0460
Former-commit-id: 713be7a0d247874d2807d3b5c3e1411449c3821e [formerly 33da766f63]
Former-commit-id: 348f5f0f41
2013-03-01 10:48:03 -06:00
Nate Jensen
91d577f4db Issue #1744 fix deadlock
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f

Former-commit-id: 394a96db44 [formerly e2f12d16b7] [formerly 2a575a24e7] [formerly f4cccabc07 [formerly 2a575a24e7 [formerly 48ef00523488cdf4f65b86c5b74331f908192191]]]
Former-commit-id: f4cccabc07
Former-commit-id: cea33e5e9d7f091f9ec47d746199097bf2783899 [formerly f7ffa22c7c]
Former-commit-id: c5600acf79
2013-03-01 10:12:56 -06:00
Bryan Kowal
5231011f8c Issue #1662 - wrapper parameters can now be used to specify the order
of jvm parameters since yajsw does not enforce the ordering or
uniqueness of jvm argument parameters

Change-Id: I9485d2a2992adfb37cade0e6977aab27e3a3217c

Former-commit-id: 1b65ae1967 [formerly 5b3478d6c7] [formerly 8bf5e3ffad] [formerly 44349717fb [formerly 8bf5e3ffad [formerly aae64b29491d8da0001cf1182a357683546d4593]]]
Former-commit-id: 44349717fb
Former-commit-id: f8cc7d08a49eb461437d41b449d73fc597f0f504 [formerly 4f7fed259c]
Former-commit-id: 65fb00c3c3
2013-02-27 12:46:48 -06:00
Ron Anderson
dc8d1dd95c Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]
Former-commit-id: 541557e0b0
2013-02-26 18:44:51 -06:00
Nate Jensen
ec7eecbb4f Merge "Issue #1642: Fix QPID Deadlock scenario - Address peer review comments" into development
Former-commit-id: 0cd78444b8 [formerly a020438c99] [formerly 58957d30e5] [formerly 24c94ef55b [formerly 58957d30e5 [formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]]
Former-commit-id: 24c94ef55b
Former-commit-id: e65c9fe57e543cc92e2c686a843d870e73f0bdb8 [formerly b6fc51a18c]
Former-commit-id: 652ac25d12
2013-02-26 18:00:50 -06:00
Richard Peter
0b51936566 Issue #1642: Fix QPID Deadlock scenario
- Address peer review comments

Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462

Former-commit-id: 3e5ab03ecf [formerly 7d4206420c] [formerly 9a0177861f] [formerly 5b2650599d [formerly 9a0177861f [formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]]
Former-commit-id: 5b2650599d
Former-commit-id: 34da74ced85f0f692350cc266348ad7532e0abff [formerly 4deaf372a1]
Former-commit-id: ea806139d3
2013-02-26 16:01:25 -06:00
Dustin Johnson
c23b8a58c3 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 88a9b953b6 [formerly 7852f88352 [formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]]
Former-commit-id: 88a9b953b6
Former-commit-id: 188d47a162860963a3b8ee6af04bd72c07f6168a [formerly cc0254ba03]
Former-commit-id: 94300e0c1d
2013-02-26 15:06:04 -06:00
Nate Jensen
5853f48992 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 36d4eff2c6 [formerly b062299796 [formerly 03591924b4efdc13f1cc01182d39e280309cf381]]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 6b86c197517307ff2a80b25f90eb928605a06ecd [formerly 5c33098315]
Former-commit-id: b173d34ba9
2013-02-26 13:53:40 -06:00
Matt Nash
9ac60409d6 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 051b36ad73 [formerly a2fb0db684 [formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]]
Former-commit-id: 051b36ad73
Former-commit-id: ae09dddec53fb271e50dd90fd45b73f94ff690be [formerly b1fe380c44]
Former-commit-id: 32096feba8
2013-02-26 13:29:04 -06:00
Dustin Johnson
e6d447b00d Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: eaa295dddb [formerly ebf02481f0] [formerly d58d28c636] [formerly 722e41b8b0 [formerly d58d28c636 [formerly 2b52368c81272df18f3af1334057295d11bb4b52]]]
Former-commit-id: 722e41b8b0
Former-commit-id: 1fb58b752e38ec55f49ddf711fd9f47baf778025 [formerly cf86c92fad]
Former-commit-id: 219e882fc5
2013-02-26 11:32:03 -06:00
Steve Harris
e4b9ef2cd3 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 e8135b9c14 [formerly b50e384a0f [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]]
Former-commit-id: e8135b9c14
Former-commit-id: 516b4ee30c97e99a87f971673c76dd8b45556e63 [formerly 2398ef1e85]
Former-commit-id: 901cbbf56d
2013-02-25 16:05:22 -06:00
Steve Harris
f30d1cdf87 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]
Former-commit-id: e46625f8f2
2013-02-25 15:58:48 -06:00
Bryan Kowal
f4bf7e1adb Issue #1634 - fix EDEX debug with YAJSW Wrapper
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

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

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]
Former-commit-id: 01ef273417
2013-02-25 09:29:16 -06:00
Steve Harris
30efc4c86a 13.3.1-3 baseline
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]
Former-commit-id: 05eb25f124
2013-02-25 10:24:53 -05:00
Steve Harris
f2428e968a 13.3.1-2 baseline
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]
Former-commit-id: 370ed98038
2013-02-25 10:18:36 -05:00
Dustin Johnson
637c7e62c2 Issue #1543 Make DAOs public
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 0743782772 [formerly 06b7697553 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]
Former-commit-id: 0743782772
Former-commit-id: 0129926124bc6953a319174f4ae9c67d11da1444 [formerly 4e87912a9c]
Former-commit-id: a1df296e80
2013-02-22 12:22:43 -06:00
Bryan Kowal
ec53fa98cd Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]
Former-commit-id: 53b9e69868
2013-02-22 09:28:37 -06:00
Steve Harris
7e48d3e684 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 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Bryan Kowal
6a47017449 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 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]
Former-commit-id: b2a0a7c148
2013-02-21 13:55:28 -06:00
Nate Jensen
b423cd4d70 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
Former-commit-id: ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 7dbeeb2684 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]
Former-commit-id: c6896b5676
Former-commit-id: 97c5442369f13721659c1b0c23d03bc01ac6815a [formerly 4f4932b014]
Former-commit-id: 533deac8d0
2013-02-21 11:47:00 -06:00
Nate Jensen
e19664ab18 Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]
Former-commit-id: 6f9d3f55e5
2013-02-21 11:41:52 -06:00
Steve Harris
96c7269df0 13.3.1-1 baseline
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]
Former-commit-id: 0569ff413d
2013-02-21 09:36:59 -05:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Dustin Johnson
18cfc1ee4d 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 cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]]
Former-commit-id: cb1380af90
Former-commit-id: 48d8590ebfaa96f41ee4b9def3d4c9a8b17d1c3c [formerly 5031ae4d66]
Former-commit-id: f552967bf3
2013-02-20 16:17:20 -06:00
Dave Hladky
f439b63316 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]
Former-commit-id: 261d00c544
2013-02-20 16:13:08 -06:00
Ben Steffensmeier
9d34dce3de Issue #1628 clean up Inflaters used by HttpClient.
Former-commit-id: 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly e2efad85fe [formerly ef2dd2a031 [formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]]]
Former-commit-id: e2efad85fe
Former-commit-id: 8365e04958c1ccf70f03afee22501ef446beba5f [formerly 2debab14f5]
Former-commit-id: 0f1057cb3d
2013-02-20 12:58:13 -06:00
Roger Ferrel
672a979183 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 dd05bc65be [formerly 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]]
Former-commit-id: dd05bc65be
Former-commit-id: bb8e979b980b2c5128f11b8e520f639e237ea72a [formerly 8264adc47d]
Former-commit-id: e47c91eda7
2013-02-20 12:09:26 -06:00
Dustin Johnson
0c7c2a6abd 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 c8760e5699 [formerly d8659e742e [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]]
Former-commit-id: c8760e5699
Former-commit-id: f672d4337c7763a3c1b36a4e134928216fc2dff2 [formerly ca721863be]
Former-commit-id: 5a8b6459d4
2013-02-20 10:42:51 -06:00
Ben Steffensmeier
9c889bcc37 Issue #1598 fix GridParamInfo keys.
Former-commit-id: 4370018cbf [formerly 7d4b065a23] [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 1ab9f7bd1f [formerly 33da1c48a76b468b9fee4e05de835295c7393672]]]
Former-commit-id: c1b8ceecf1
Former-commit-id: a3eea6c6923a0758fd9d051e07105c75b85536a9 [formerly 48e6ffe392]
Former-commit-id: cde7275a2a
2013-02-19 14:06:26 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
2013-02-19 12:22:00 -06:00
Dustin Johnson
8d32c1ee00 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 116809346b [formerly cc598094fa [formerly 66fe560026848357ae165a675be9818da719675d]]]
Former-commit-id: 116809346b
Former-commit-id: fa68e8e6e2aeab2fdd4a5f732b9524d93c0d5e1a [formerly 3585482cad]
Former-commit-id: 5ff6387368
2013-02-18 15:47:17 -06:00
Richard Peter
24f36419b3 Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development
Former-commit-id: 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly f364af584d [formerly 77157e3c6c [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]
Former-commit-id: f364af584d
Former-commit-id: 6929b91f2a2d234b16abab0c3bdda8ad2a62bffb [formerly 623020926e]
Former-commit-id: d42a0b9f0d
2013-02-18 15:36:41 -06:00
Dustin Johnson
3110a88e0c 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 62a84aea76 [formerly 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]
Former-commit-id: 62a84aea76
Former-commit-id: 9b75194ff411af8419ede2a4c14daf3b155c88ab [formerly db3a9d8f19]
Former-commit-id: 6f94c035e8
2013-02-18 13:05:41 -06:00
Ben Steffensmeier
f945303603 Issue #1598 Make GridParamInfoLookup filter on extension.
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly d2e17d1473 [formerly 63a725718d [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 11155351011bccb8beb1a89d0e39e1bd4e8881b5 [formerly 5ada0b2c2a]
Former-commit-id: 47090eccc1
2013-02-18 10:36:47 -06:00