Dustin Johnson
d12fad8225
Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
...
Former-commit-id: 90b18cc477
[formerly 2262872d2d
[formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]
Former-commit-id: 2262872d2d
Former-commit-id: def94b337f
2013-03-05 15:01:02 -06:00
Steve Harris
afd934db35
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: aa0e9acefd
[formerly d5b80f9225
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: d5b80f9225
Former-commit-id: 6b13492420
2013-03-05 12:29:44 -06:00
Steve Harris
3ec20c1689
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 305dd72969
Former-commit-id: 61a19a460b
2013-03-05 12:27:49 -06:00
Dustin Johnson
9cbd54fb43
Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
...
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd
Former-commit-id: 547780f9a3
[formerly 8107f76d98
[formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]
Former-commit-id: 8107f76d98
Former-commit-id: 2bd62ad4b6
2013-03-05 11:39:42 -06:00
Steve Harris
e4a1c61ad5
13.3.1-5 baseline
...
Former-commit-id: e26f7eb151
[formerly a89221c75b
[formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
2013-03-05 10:47:06 -06:00
Steve Harris
9066d511fe
13.3.1-4 baseline
...
Former-commit-id: 2edca90902
[formerly 8c0b90f292
[formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
2013-03-05 10:39:59 -06:00
Nate Jensen
68716aedc0
Merge "Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build" into development
...
Former-commit-id: 8d44b9ea05
[formerly 75d959f536
[formerly 9d53ac277f9a83c7060552e5becda2b2d708ee9e]]
Former-commit-id: 75d959f536
Former-commit-id: c21079cc06
2013-03-05 09:10:31 -06:00
Dustin Johnson
14db0ef448
Merge "Issue #1644 WFO bandwidth manager delegates to NCF bandwidth manager for SBN subscriptions" into development
...
Former-commit-id: ef632b7bfa
[formerly c6137e89e7
[formerly aae57f37aa7da6374958220bc09f91fd0d05a3b1]]
Former-commit-id: c6137e89e7
Former-commit-id: 9a6b647989
2013-03-05 08:53:09 -06:00
Richard Peter
3cc3648b9b
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 784cd2145f
[formerly 070f62d08e
[formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 070f62d08e
Former-commit-id: e74f6074e7
2013-03-04 17:48:05 -06:00
Dave Hladky
d0cfd09209
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: fc36146f48
[formerly 680317d9c4
[formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: 680317d9c4
Former-commit-id: 22ebfe0ecb
2013-03-04 17:41:11 -06:00
Bryan Kowal
7434229e35
Issue #1638 - repack any EDEX plugins that were unpacked by the Eclipse pde build
...
Change-Id: I8284ad58f4f3ddd16ad04f00720f3de9e63a954a
Former-commit-id: cd08f88c43
[formerly 862f97a19b
[formerly d92a3c612b59d594a24ea253ad1289af7e8b7b8b]]
Former-commit-id: 862f97a19b
Former-commit-id: eb4d75de7f
2013-03-04 15:52:07 -06:00
Dustin Johnson
7bfc28b6f8
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: 54c3980cba
[formerly 1161125c84
[formerly 28c97849800c624bdaa161f05777703ee2a510ac]]
Former-commit-id: 1161125c84
Former-commit-id: 73f884753a
2013-03-04 14:55:50 -06:00
Steve Harris
f14f5aeb48
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit 394a96db44
[formerly e2f12d16b7
] [formerly 2a575a24e7
] [formerly f4cccabc07
[formerly 2a575a24e7
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]].
Former-commit-id: fcb48a7280
[formerly 28391884a7
[formerly f7d3af09b6a0ff2c729986880531ec59f9c9e2af]]
Former-commit-id: 28391884a7
Former-commit-id: 7ffb42d6e6
2013-03-04 13:03:19 -06:00
Steve Harris
702cec08bd
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit eefa0d8e87
[formerly 3dc69632c1
] [formerly 8c84bc5fbb
] [formerly 35007e0460
[formerly 8c84bc5fbb
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]].
Former-commit-id: bba410a330
[formerly 88e633934d
[formerly 2d7d40f23da46f1825aaeab81549ee37700670eb]]
Former-commit-id: 88e633934d
Former-commit-id: 870972fb90
2013-03-04 13:02:32 -06:00
Dustin Johnson
446e86bd19
Issue #1647 Configure NCF and WFO retrieval tasks
...
Change-Id: I038a8c297587982b98ca419311b4e38894947ed4
Former-commit-id: bf9eefe961
[formerly de7f387248
[formerly 14c1f2d908f4cba6353251fa87062f6f8722c7e9]]
Former-commit-id: de7f387248
Former-commit-id: 527ed01fec
2013-03-04 10:22:16 -06:00
Nate Jensen
64d504df91
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: 677908868e
[formerly a90a2fe857
[formerly 2323a19cb44d6ff56188ed7d9062daf1fdc828fe]]
Former-commit-id: a90a2fe857
Former-commit-id: 6bf2eefa2a
2013-03-01 13:43:50 -06:00
David Gillingham
e2a7d7a350
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: 9351f33c1c
[formerly 50744c1f92
[formerly 1e72fe30d97504f70352a181de35805a197e50f4]]
Former-commit-id: 50744c1f92
Former-commit-id: ca81ae4a71
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
f505cda0bf
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: 9263ff1846
[formerly 86b9a4d8c2
[formerly f97d09f3ee362f0f0b6155e0bb704ffd3611ca1a]]
Former-commit-id: 86b9a4d8c2
Former-commit-id: b0870c55f6
2013-03-01 11:03:11 -06:00
Nate Jensen
eefa0d8e87
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 35007e0460
[formerly 8c84bc5fbb
[formerly 56d6dd7fb0d16ef5fdb545e816fedddb28273024]]
Former-commit-id: 8c84bc5fbb
Former-commit-id: 3dc69632c1
2013-03-01 10:48:03 -06:00
Nate Jensen
394a96db44
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: f4cccabc07
[formerly 2a575a24e7
[formerly 48ef00523488cdf4f65b86c5b74331f908192191]]
Former-commit-id: 2a575a24e7
Former-commit-id: e2f12d16b7
2013-03-01 10:12:56 -06:00
Bryan Kowal
875c17399a
Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
...
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue
Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc
Former-commit-id: 4faf8aefbe
[formerly d081a2afcd
[formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: d081a2afcd
Former-commit-id: f806c880d3
2013-02-28 18:09:25 -06:00
Ben Steffensmeier
8e2333d0d7
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 2ca86633d6
[formerly f46686a6e2
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: f46686a6e2
Former-commit-id: d27d30c2db
2013-02-28 17:00:56 -06:00
Dustin Johnson
bd70b0d8f3
Merge "Issue #1673 : Moved data delivery specific files from minDB configuration where possible" into development
...
Former-commit-id: 59212a8241
[formerly 44140d1e0f
[formerly fa998e70583a79d591eb956f9ab5deabc4eadea3]]
Former-commit-id: 44140d1e0f
Former-commit-id: 64cfd1c51d
2013-02-28 16:24:21 -06:00
Benjamin Phillippe
c528a3572a
Issue #1738 : Removed unused project com.raytheon.uf.edex.ebxml
...
Change-Id: I87783b45692c84cf851fb5695dae7efa79308655
Former-commit-id: e01ae283f7
[formerly e0033900cf
[formerly 323bdc5919de9f04849e325dfdeb868ccdb39603]]
Former-commit-id: e0033900cf
Former-commit-id: fd5302a619
2013-02-28 15:01:53 -06:00
Benjamin Phillippe
90d05f13ff
Issue #1673 : Moved data delivery specific files from minDB configuration where possible
...
Change-Id: I09b34e7c429b4f657e586fc64bcbbcc1ceed3585
Former-commit-id: d3d5886233
[formerly 29e2b0fd9e
[formerly b279ad4cc4401c54cd0e2af8170e254cbbc0e53b]]
Former-commit-id: 29e2b0fd9e
Former-commit-id: b2da92ac85
2013-02-28 14:56:31 -06:00
Max Schenkelberg
0fb8bb14d2
Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
...
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62
Former-commit-id: 547c593dec
[formerly ec40d261e5
[formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: ec40d261e5
Former-commit-id: 1769edc026
2013-02-27 16:19:58 -06:00
Bryan Kowal
1b65ae1967
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: 44349717fb
[formerly 8bf5e3ffad
[formerly aae64b29491d8da0001cf1182a357683546d4593]]
Former-commit-id: 8bf5e3ffad
Former-commit-id: 5b3478d6c7
2013-02-27 12:46:48 -06:00
Max Schenkelberg
2fd6f3ed4e
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: 38bba3705f
[formerly 0f1112fb3e
[formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]
Former-commit-id: 0f1112fb3e
Former-commit-id: c8a5f1a007
2013-02-27 12:26:32 -06:00
Max Schenkelberg
d0b7850775
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: e0ba97d547
[formerly 4ed4ef8d71
[formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: 4ed4ef8d71
Former-commit-id: 2611980ca4
2013-02-27 11:50:38 -06:00
Ron Anderson
547f0d086f
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: f37999b1eb
[formerly bfe3c684df
[formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]
Former-commit-id: bfe3c684df
Former-commit-id: d43afc8c67
2013-02-26 18:44:51 -06:00
Nate Jensen
0cd78444b8
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: 24c94ef55b
[formerly 58957d30e5
[formerly 1206430bc0142b0facee03ee95e4bd5fc8c0305a]]
Former-commit-id: 58957d30e5
Former-commit-id: a020438c99
2013-02-26 18:00:50 -06:00
Richard Peter
3e5ab03ecf
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 5b2650599d
[formerly 9a0177861f
[formerly 2071d4f3cc54a3da43443bc71cecf038736194d8]]
Former-commit-id: 9a0177861f
Former-commit-id: 7d4206420c
2013-02-26 16:01:25 -06:00
Dustin Johnson
1d9690f299
Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file.
...
Change-Id: Ic32df9138b270d1e2c3a9d137d2ad292706ab5b7
Former-commit-id: 88a9b953b6
[formerly 7852f88352
[formerly 6ab17d82c5e4961e662acf80e26d23f3bbfaada2]]
Former-commit-id: 7852f88352
Former-commit-id: 8038b840d8
2013-02-26 15:06:04 -06:00
Nate Jensen
eb2e9f64f4
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: 36d4eff2c6
[formerly b062299796
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]
Former-commit-id: b062299796
Former-commit-id: 15c4c4dfa0
2013-02-26 13:53:40 -06:00
Matt Nash
9dc4390b7e
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: 051b36ad73
[formerly a2fb0db684
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]
Former-commit-id: a2fb0db684
Former-commit-id: 41bbd4cf2d
2013-02-26 13:29:04 -06:00
Dustin Johnson
eaa295dddb
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: 722e41b8b0
[formerly d58d28c636
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: d58d28c636
Former-commit-id: ebf02481f0
2013-02-26 11:32:03 -06:00
Steve Harris
650db426b9
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: e8135b9c14
[formerly b50e384a0f
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: b50e384a0f
Former-commit-id: cd99e680bb
2013-02-25 16:05:22 -06:00
Steve Harris
90b0bab156
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 6ec9e73035
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 67f090638f
Former-commit-id: 0a4564eb97
2013-02-25 15:58:48 -06:00
Bryan Kowal
1ea7fbe69e
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: 0d2262c0bf
[formerly b05073fbe3
[formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]
Former-commit-id: b05073fbe3
Former-commit-id: 4d160993fb
2013-02-25 11:30:13 -06:00
Mike Duff
018953526b
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 81649d346a
[formerly 8bddd467b1
[formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 8bddd467b1
Former-commit-id: 8a8e8f7a73
2013-02-25 09:29:16 -06:00
Steve Harris
4a0eea00b5
13.3.1-3 baseline
...
Former-commit-id: 8a64f142e5
[formerly 6572452887
[formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 6572452887
Former-commit-id: a55f438dd8
2013-02-25 10:24:53 -05:00
Steve Harris
0b3acc0130
13.3.1-2 baseline
...
Former-commit-id: 3d115ed3be
[formerly df6d6f598e
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: df6d6f598e
Former-commit-id: 3e60b23072
2013-02-25 10:18:36 -05:00
Dustin Johnson
5a4dd6fbd1
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 0743782772
[formerly 06b7697553
[formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]
Former-commit-id: 06b7697553
Former-commit-id: d4186178af
2013-02-22 12:22:43 -06:00
Bryan Kowal
6f419ae22f
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: d5c8b82941
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: 7c62991edf
Former-commit-id: 4cd5453e0a
2013-02-22 09:28:37 -06:00
Steve Harris
abdc733151
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: 2641d578e2
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: a0573644c4
Former-commit-id: 64744fdb19
2013-02-21 15:41:39 -06:00
Bryan Kowal
0d4a63efe4
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: 803397c7c7
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: a8fb04f41c
Former-commit-id: 519ce2c0fb
2013-02-21 13:55:28 -06:00
Nate Jensen
ec0dd8d234
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: c6896b5676
[formerly 7dbeeb2684
[formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]
Former-commit-id: 7dbeeb2684
Former-commit-id: b2f7cbcbe3
2013-02-21 11:47:00 -06:00
Nate Jensen
a8e81097fc
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: 73f53bd513
[formerly a9c4e54287
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: a9c4e54287
Former-commit-id: 033b9e3852
2013-02-21 11:41:52 -06:00
Steve Harris
9bdd52a626
13.3.1-1 baseline
...
Former-commit-id: cabc8cf8b4
[formerly 0563d7ac18
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: 0563d7ac18
Former-commit-id: 96768407a5
2013-02-21 09:36:59 -05:00
Steve Harris
e0406d3183
13.3.1-1 baseline
...
Former-commit-id: d2a654625f
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
2013-02-20 16:19:40 -06:00