Nate Jensen
c06d4abcee
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: b062299796b06229979636d4eff2c65c33098315
2013-02-26 13:53:40 -06:00
Nate Jensen
eced16c428
Merge "Issue #1506 fix deadlock and edit areas showing up from query" into development
...
Former-commit-id: 1e50b3a0e81e50b3a0e84e60fa682de1660e51f8
2013-02-26 13:46:30 -06:00
Dustin Johnson
abf85b6b0e
Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
...
Former-commit-id: 47cb278c0147cb278c01d31392d740a7d4b23597
2013-02-26 13:41:46 -06:00
Dustin Johnson
50e749e38e
Merge "Issue #1643 Add NCF bandwidth manager router" into development
...
Former-commit-id: 42402c5d7342402c5d73fb235e3f43a648519673
2013-02-26 13:41:36 -06:00
Dustin Johnson
77f811d090
Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
...
Former-commit-id: fb38cceecdfb38cceecd76738dbf7db77ebdc924
2013-02-26 13:37:14 -06:00
Matt Nash
1c51407ffd
Issue #1668 add gsd pattern to allow for their plugins to be deployed
...
Change-Id: Icbabbdd188557d8f6143e026e4165fc12a51a0d6
Former-commit-id: a2fb0db684a2fb0db684051b36ad73b1fe380c44
2013-02-26 13:29:04 -06:00
Matt Nash
18ccbd7c5d
Issue #1506 fix deadlock and edit areas showing up from query
...
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49
Former-commit-id: c728f72ea3c728f72ea3b749edca5451e6302178
2013-02-26 12:20:08 -06:00
Dustin Johnson
21bd89a9fd
Issue #1592 Don't submit adhoc query when X button clicked
...
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279
Former-commit-id: 598eb88a04598eb88a04c6975aa379ab1dc2272b
2013-02-26 12:07:36 -06:00
Dustin Johnson
b62631b9d1
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: d58d28c636d58d28c636722e41b8b0cf86c92fad
2013-02-26 11:32:03 -06:00
Steve Harris
3df38c0fc6
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 9bcabe2c5d9bcabe2c5d098b1e157957440abebb
2013-02-25 20:41:26 -06:00
Richard Peter
d1917a79a2
Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
...
Former-commit-id: be9370576abe9370576a1669945cdbaa5f3c80a0
2013-02-25 17:47:14 -06:00
Richard Peter
731710f355
Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
...
Former-commit-id: b98bdb3d81b98bdb3d813b718bea52c21a1e9f61
2013-02-25 17:46:26 -06:00
Lee Venable
8af64a568d
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
...
Former-commit-id: e024e4e087e024e4e0877f769af4270125935a7f
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
b275cdf701
Issue #1625 Updated addOrRemoveCounty method.
...
Former-commit-id: cd6dd3c178cd6dd3c1788c2c7c97f7d4f4832d1a
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
de75bbf5a7
Issue #1659 Stop derived parameters from sending empty requests for cached times
...
Former-commit-id: 71652af08671652af0869edeadc966d6c59cb85a
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
bb8554031f
Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
...
Former-commit-id: fd2450c0dffd2450c0df2fa5fb488ee1e7a12ca2
2013-02-25 16:58:25 -06:00
Nate Jensen
2e3f3f66b3
Merge "Issue #1659 Cache station in StationUtils" into development
...
Former-commit-id: bbbdc17c06bbbdc17c0666e1411de1135006ff0c
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
02f1f6a065
Issue #1659 Cache station in StationUtils
...
Former-commit-id: 842437870e842437870e39bf907df75be0eab696
2013-02-25 16:25:55 -06:00
Steve Harris
1d8b6e0256
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: b50e384a0fb50e384a0fe8135b9c142398ef1e85
2013-02-25 16:05:22 -06:00
Steve Harris
140ae3191c
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f67f090638f6ec9e730350051276ad1
2013-02-25 15:58:48 -06:00
Steve Harris
f14049cf3f
13.3.1-3 baseline
...
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1
conflicts resolved by 'theirs' strategy (all of 13.3.1-10)
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: cf951785c8cf951785c8db761c0f1962e15dacdb
2013-02-25 15:54:24 -06:00
Mike Duff
ce30c45c88
Issue #1588 - Fix match any/all in data browser dialog
...
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49
Former-commit-id: d00a790d7bd00a790d7b086d24acc81365596d4d
2013-02-25 15:53:55 -06:00
Bryan Kowal
ebe04d4919
Issue #1634 - fix EDEX debug with YAJSW Wrapper
...
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96
Former-commit-id: b05073fbe3b05073fbe30d2262c0bf36a887416f
2013-02-25 11:30:13 -06:00
Dustin Johnson
c67c766b34
Merge "Issue #1620 - Fix set clean issue with job loader." into development
...
Former-commit-id: 83a915210d83a915210deff20112d21255b87e2e
2013-02-25 09:43:19 -06:00
Nate Jensen
df183bb4da
Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
...
Former-commit-id: b514792bbcb514792bbc5d828d4d62cb37bab362
2013-02-25 09:31:55 -06:00
Nate Jensen
ff80c774e3
Merge "Issue #1628 lower Xmx on windows in awips.product." into development
...
Former-commit-id: c1becf797ac1becf797a545caf22fb87a745eb2f
2013-02-25 09:31:20 -06:00
Mike Duff
a92492ed07
Issue #1552 - Implement FFMP Data Access
...
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55
Former-commit-id: 8bddd467b18bddd467b181649d346ab1a549a99f
2013-02-25 09:29:16 -06:00
Steve Harris
1ba778753f
13.3.1-3 baseline
...
Former-commit-id: 657245288765724528878a64f142e58d741715e3
2013-02-25 10:24:53 -05:00
Steve Harris
2a2a9e03b7
13.3.1-2 baseline
...
Former-commit-id: df6d6f598edf6d6f598e3d115ed3bee8a51dc780
2013-02-25 10:18:36 -05:00
Mike Duff
c99aaf6302
Issue #1620 - Fix set clean issue with job loader.
...
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028
Former-commit-id: af8b97cd3caf8b97cd3c3340a9ddd8c904dc42ef
2013-02-24 19:13:57 -06:00
Roger Ferrel
b73720e881
Issue #1442 Fix null pointer exception in DecisonTree's searchTree
...
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef
Former-commit-id: 152715160e152715160e09b5996dacfd95a99596
2013-02-22 12:49:53 -06:00
Dustin Johnson
0d9f121548
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 06b769755306b769755307437827724e87912a9c
2013-02-22 12:22:43 -06:00
Bryan Kowal
fd17273cb2
Issue #1634 - force added wrapper jars in bin directory
...
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48
Former-commit-id: 7c62991edf7c62991edfd5c8b829415a5914c010
2013-02-22 09:28:37 -06:00
Ben Steffensmeier
4dad2798e8
Issue #1617 fixed vb sounding point selection for points which contain the word Point
...
Former-commit-id: 1d8ad288b41d8ad288b45701309bcb7c0f1bf788
2013-02-21 16:28:41 -06:00
Steve Harris
f3c3191a1c
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: a0573644c4a0573644c42641d578e233dd2589f1
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
b8ecbb9387
Issue #1628 lower Xmx on windows in awips.product.
...
Former-commit-id: 62eaf8e94762eaf8e9470bb2c03a834209a3cfb1
2013-02-21 14:30:41 -06:00
Bryan Kowal
2a21f2624b
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: a8fb04f41ca8fb04f41c803397c7c7450e8e7a4c
2013-02-21 13:55:28 -06:00
Nate Jensen
0f92e92c18
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: 7dbeeb26847dbeeb2684c6896b56764f4932b014
2013-02-21 11:47:00 -06:00
Nate Jensen
767596401f
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: a9c4e54287a9c4e5428773f53bd513d7a57d2b34
2013-02-21 11:41:52 -06:00
Ron Anderson
1ce8dad54c
Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
...
Former-commit-id: 03c48b2f7a03c48b2f7a297c132c49ff2370221a
2013-02-21 09:10:07 -06:00
Matt Nash
441c6646ef
Issue #1506 fix for GFE evaluateRefSet() for non-queries
...
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7
Former-commit-id: 2001d916ac2001d916ac492df9c2385d6a7a6140
2013-02-21 09:01:33 -06:00
Steve Harris
654f15be5c
13.3.1-1 baseline
...
Former-commit-id: 0563d7ac180563d7ac18cabc8cf8b492e4c7ba19
2013-02-21 09:36:59 -05:00
Steve Harris
8c5659e589
13.2.1-8 baseline
...
Merge commit '1da0393' into master_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 7f2b4a80927f2b4a80922f7bf90856a723531b31
2013-02-21 09:25:27 -05:00
Lee Venable
146afe1980
Merge "Issue #1609 update style rules for msl-P contours" into development
...
Former-commit-id: 46aa0595d846aa0595d87d2452e0effbaf19e184
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
c46775f84a
Issue #1609 update style rules for msl-P contours
...
Former-commit-id: e7f73db73ce7f73db73cf029f74a4f5b9e13aa3d
2013-02-20 17:27:16 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e899002171e8990021d2a654625f46d28be4a4
2013-02-20 16:19:40 -06:00
Dustin Johnson
d62153b1b4
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: a9e976eed8a9e976eed8cb1380af905031ae4d66
2013-02-20 16:17:20 -06:00
Dave Hladky
cd74938355
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: 7b36b055f17b36b055f141f2ea7efeb1c8f153e0
2013-02-20 16:13:08 -06:00
Dustin Johnson
df32a80148
Merge "Issue #1589 - Fix saving of custom subset areas in spatial subset tab" into development
...
Former-commit-id: 3b77fe909d3b77fe909d6c9bb4366ac1bc9d15ab
2013-02-20 15:39:00 -06:00
Lee Venable
72e6d999f9
Merge "Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools." into development
...
Former-commit-id: d0ab7330fcd0ab7330fca9f4bfb079c1fc60a3d1
2013-02-20 15:05:17 -06:00
