Steve Harris
245afb28c8
Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1
...
Conflicts (just history comments):
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 1a999fee5ac18b96dc4c
2013-03-18 16:43:22 -05:00
Steve Harris
5f492500ea
13.3.1-8 baseline
...
Former-commit-id: f97d78994bc15b3ffe20
2013-03-18 15:43:32 -05:00
Nate Jensen
dad08657aa
Issue #1795 speed up publish by optimizing publish time updates in grid histories
...
Change-Id: I43c3f63d60832c49c6d02dab97c47d2b1f12f1c8
Former-commit-id: e65267d5f3235952a115
2013-03-15 16:10:11 -05:00
Ben Steffensmeier
a6140145a4
Issue #1777 fix subgridding range problems
...
Former-commit-id: 5bd20414eb0daa5817d0
2013-03-14 09:56:00 -05:00
Nate Jensen
d881ab1442
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: dbd2729336eaef235e8e
2013-03-13 16:17:44 -05:00
Dave Hladky
160e1594b8
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 38b952a2205dc454c7ef
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
247c9f6c1f
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 36b3c16a42ddf2092bde
2013-03-13 13:21:16 -05:00
Steve Harris
31c0a97dca
13.3.1-7 baseline
...
Former-commit-id: a72254cc75e12ed113ae
2013-03-13 09:50:28 -05:00
Roger Ferrel
8bb9044e3a
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: c5a2786c84b5743e8f9b
2013-03-12 16:58:06 -05:00
Dave Hladky
6ea95002de
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: a1006667e04b08491880
2013-03-12 15:48:34 -05:00
Steve Harris
4ed21b702b
13.3.1-6 baseline
...
Former-commit-id: 3a4c7931e1566b677d09
2013-03-12 08:35:45 -05:00
Roger Ferrel
334f2c4a57
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: 4deb731bd0b421c97d86
2013-03-11 13:00:44 -05:00
Nate Jensen
d7902aba68
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 5e3d6df7e05c59a61cef
2013-03-07 16:49:40 -06:00
David Gillingham
5ad72e2a7f
Issue #1447 : Implement active table fetching, make bug fixes
...
to active table sharing from testing.
Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d
Former-commit-id: 95f8074c970a79d08dd8
2013-03-06 14:23:00 -06:00
Dustin Johnson
bfed4555a2
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
...
Former-commit-id: d4c6c29f5f3eddb2d286
2013-03-05 13:32:04 -06:00
Steve Harris
a8e1557c62
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 305dd7296957f42761d7
2013-03-05 12:27:49 -06:00
Mike Duff
775a0e3edd
Issue #1752 - Lock down user admin dialog
...
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: 6809cb6f80193cf1e54f
2013-03-05 11:26:54 -06:00
Steve Harris
a40c9136fe
13.3.1-5 baseline
...
Former-commit-id: a89221c75be26f7eb151
2013-03-05 10:47:06 -06:00
Steve Harris
5e55ded3a9
13.3.1-4 baseline
...
Former-commit-id: 8c0b90f2922edca90902
2013-03-05 10:39:59 -06:00
Richard Peter
180540eb47
Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1
...
Former-commit-id: 070f62d08e784cd2145f
2013-03-04 17:48:05 -06:00
Dave Hladky
1260b40307
Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
...
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4
Former-commit-id: 680317d9c4fc36146f48
2013-03-04 17:41:11 -06:00
Steve Harris
9e87721b85
Issue #1744 - Revert "Issue #1744 fix deadlock"
...
This reverts commit f7ffa22c7cf4cccabc072a575a24e728391884a7fcb48a7280
2013-03-04 13:03:19 -06:00
Steve Harris
7d2286aea7
Issue #1744 - Revert "Issue #1744 actually fix deadlock this time"
...
This reverts commit 33da766f6335007e04608c84bc5fbb88e633934dbba410a330
2013-03-04 13:02:32 -06:00
Nate Jensen
216e3d6ad3
Merge "Issue #1731 Optimize construction of scan resource. Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b" into omaha_13.3.1
...
Former-commit-id: a90a2fe857677908868e
2013-03-01 13:43:50 -06:00
David Gillingham
77a3f33fd5
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: 50744c1f929351f33c1c
2013-03-01 11:05:02 -06:00
Ben Steffensmeier
5a149c5dfa
Issue #1731 Optimize construction of scan resource.
...
Change-Id: Id99a154e2f26df44b631995eb448ecfdf2badf9b
Former-commit-id: 86b9a4d8c29263ff1846
2013-03-01 11:03:11 -06:00
Nate Jensen
33da766f63
Issue #1744 actually fix deadlock this time
...
Change-Id: I9c5468d4d7d8fe19e709bc9cce42f06ca60d3eeb
Former-commit-id: 8c84bc5fbb35007e0460
2013-03-01 10:48:03 -06:00
Nate Jensen
f7ffa22c7c
Issue #1744 fix deadlock
...
Change-Id: I2cff166dcdb217e0c7665deece302e5c9ac92c8f
Former-commit-id: 2a575a24e7f4cccabc07
2013-03-01 10:12:56 -06:00
Bryan Kowal
4f7fed259c
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: 8bf5e3ffad44349717fb
2013-02-27 12:46:48 -06:00
Ron Anderson
77fbbb6a61
Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
...
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765
Former-commit-id: bfe3c684dff37999b1eb
2013-02-26 18:44:51 -06:00
Nate Jensen
b6fc51a18c
Merge "Issue #1642 : Fix QPID Deadlock scenario - Address peer review comments" into development
...
Former-commit-id: 58957d30e524c94ef55b
2013-02-26 18:00:50 -06:00
Richard Peter
4deaf372a1
Issue #1642 : Fix QPID Deadlock scenario
...
- Address peer review comments
Change-Id: I3c52fd57f762a762d54fdce3651c7f17a8fc6462
Former-commit-id: 9a0177861f5b2650599d
2013-02-26 16:01:25 -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: 7852f8835288a9b953b6
2013-02-26 15:06:04 -06:00
Nate Jensen
5c33098315
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: b06229979636d4eff2c6
2013-02-26 13:53:40 -06:00
Matt Nash
b1fe380c44
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: a2fb0db684051b36ad73
2013-02-26 13:29:04 -06:00
Dustin Johnson
cf86c92fad
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: d58d28c636722e41b8b0
2013-02-26 11:32:03 -06:00
Steve Harris
2398ef1e85
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: b50e384a0fe8135b9c14
2013-02-25 16:05:22 -06:00
Steve Harris
0051276ad1
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f6ec9e73035
2013-02-25 15:58:48 -06:00
Bryan Kowal
36a887416f
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: b05073fbe30d2262c0bf
2013-02-25 11:30:13 -06:00
Mike Duff
b1a549a99f
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8bddd467b181649d346a
2013-02-25 09:29:16 -06:00
Steve Harris
8d741715e3
13.3.1-3 baseline
...
Former-commit-id: 65724528878a64f142e5
2013-02-25 10:24:53 -05:00
Steve Harris
e8a51dc780
13.3.1-2 baseline
...
Former-commit-id: df6d6f598e3d115ed3be
2013-02-25 10:18:36 -05:00
Dustin Johnson
4e87912a9c
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 06b76975530743782772
2013-02-22 12:22:43 -06:00
Bryan Kowal
5a5914c010
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 7c62991edfd5c8b82941
2013-02-22 09:28:37 -06:00
Steve Harris
33dd2589f1
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: a0573644c42641d578e2
2013-02-21 15:41:39 -06:00
Bryan Kowal
450e8e7a4c
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: a8fb04f41c803397c7c7
2013-02-21 13:55:28 -06:00
Nate Jensen
4f4932b014
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: 7dbeeb2684c6896b5676
2013-02-21 11:47:00 -06:00
Nate Jensen
d7a57d2b34
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: a9c4e5428773f53bd513
2013-02-21 11:41:52 -06:00
Steve Harris
92e4c7ba19
13.3.1-1 baseline
...
Former-commit-id: 0563d7ac18cabc8cf8b4
2013-02-21 09:36:59 -05:00
Steve Harris
46d28be4a4
13.3.1-1 baseline
...
Former-commit-id: 71e8990021d2a654625f
2013-02-20 16:19:40 -06:00
