Nate Jensen
c06d4abcee
Merge "Issue #1668 add gsd pattern to allow for their plugins to be deployed" into development
...
Former-commit-id: b062299796
[formerly b062299796
[formerly 03591924b4efdc13f1cc01182d39e280309cf381]]
Former-commit-id: 36d4eff2c6
Former-commit-id: 5c33098315
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: 1e50b3a0e8
[formerly 1e50b3a0e8
[formerly 698d1d88b5c67498046dcec558361797a01b07f5]]
Former-commit-id: 4e60fa682d
Former-commit-id: e1660e51f8
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: 47cb278c01
[formerly 47cb278c01
[formerly bf86849d284696553ed4cbc3f347afe2f791968d]]
Former-commit-id: d31392d740
Former-commit-id: a7d4b23597
2013-02-26 13:41:46 -06:00
Dustin Johnson
50e749e38e
Merge "Issue #1643 Add NCF bandwidth manager router" into development
...
Former-commit-id: 42402c5d73
[formerly 42402c5d73
[formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]
Former-commit-id: fb235e3f43
Former-commit-id: a648519673
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: fb38cceecd
[formerly fb38cceecd
[formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]
Former-commit-id: 76738dbf7d
Former-commit-id: b77ebdc924
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: a2fb0db684
[formerly a2fb0db684
[formerly 41c12ff165a6f90edc1cd78aed0ae0053d137bb2]]
Former-commit-id: 051b36ad73
Former-commit-id: b1fe380c44
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: c728f72ea3
[formerly c728f72ea3
[formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]
Former-commit-id: b749edca54
Former-commit-id: 51e6302178
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: 598eb88a04
[formerly 598eb88a04
[formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]
Former-commit-id: c6975aa379
Former-commit-id: ab1dc2272b
2013-02-26 12:07:36 -06:00
Dustin Johnson
b62631b9d1
Issue #1643 Add NCF bandwidth manager router
...
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8
Former-commit-id: d58d28c636
[formerly d58d28c636
[formerly 2b52368c81272df18f3af1334057295d11bb4b52]]
Former-commit-id: 722e41b8b0
Former-commit-id: cf86c92fad
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: 9bcabe2c5d
[formerly 9bcabe2c5d
[formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 098b1e1579
Former-commit-id: 57440abebb
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: be9370576a
[formerly be9370576a
[formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]
Former-commit-id: 1669945cdb
Former-commit-id: aa5f3c80a0
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: b98bdb3d81
[formerly b98bdb3d81
[formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]
Former-commit-id: 3b718bea52
Former-commit-id: c21a1e9f61
2013-02-25 17:46:26 -06:00
Lee Venable
8af64a568d
Merge "Issue #1625 Updated addOrRemoveCounty method." into development
...
Former-commit-id: e024e4e087
[formerly e024e4e087
[formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]
Former-commit-id: 7f769af427
Former-commit-id: 0125935a7f
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
b275cdf701
Issue #1625 Updated addOrRemoveCounty method.
...
Former-commit-id: cd6dd3c178
[formerly cd6dd3c178
[formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: d4f4832d1a
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: 71652af086
[formerly 71652af086
[formerly 9605118022d378eb35c38d784729410d160d46df]]
Former-commit-id: 9edeadc966
Former-commit-id: d6c59cb85a
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: fd2450c0df
[formerly fd2450c0df
[formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]
Former-commit-id: 2fa5fb488e
Former-commit-id: e1e7a12ca2
2013-02-25 16:58:25 -06:00
Nate Jensen
2e3f3f66b3
Merge "Issue #1659 Cache station in StationUtils" into development
...
Former-commit-id: bbbdc17c06
[formerly bbbdc17c06
[formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]
Former-commit-id: 66e1411de1
Former-commit-id: 135006ff0c
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
02f1f6a065
Issue #1659 Cache station in StationUtils
...
Former-commit-id: 842437870e
[formerly 842437870e
[formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]
Former-commit-id: 39bf907df7
Former-commit-id: 5be0eab696
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: b50e384a0f
[formerly b50e384a0f
[formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
2013-02-25 16:05:22 -06:00
Steve Harris
140ae3191c
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 67f090638f
[formerly 67f090638f
[formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
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: cf951785c8
[formerly cf951785c8
[formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: db761c0f19
Former-commit-id: 62e15dacdb
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: d00a790d7b
[formerly d00a790d7b
[formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]
Former-commit-id: 086d24acc8
Former-commit-id: 1365596d4d
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: b05073fbe3
[formerly b05073fbe3
[formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]
Former-commit-id: 0d2262c0bf
Former-commit-id: 36a887416f
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: 83a915210d
[formerly 83a915210d
[formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]
Former-commit-id: eff20112d2
Former-commit-id: 1255b87e2e
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: b514792bbc
[formerly b514792bbc
[formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: 5d828d4d62
Former-commit-id: cb37bab362
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: c1becf797a
[formerly c1becf797a
[formerly 8525b4ac1db570160253cf7bb180914967e0b647]]
Former-commit-id: 545caf22fb
Former-commit-id: 87a745eb2f
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: 8bddd467b1
[formerly 8bddd467b1
[formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 81649d346a
Former-commit-id: b1a549a99f
2013-02-25 09:29:16 -06:00
Steve Harris
1ba778753f
13.3.1-3 baseline
...
Former-commit-id: 6572452887
[formerly 6572452887
[formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
2013-02-25 10:24:53 -05:00
Steve Harris
2a2a9e03b7
13.3.1-2 baseline
...
Former-commit-id: df6d6f598e
[formerly df6d6f598e
[formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
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: af8b97cd3c
[formerly af8b97cd3c
[formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]
Former-commit-id: 3340a9ddd8
Former-commit-id: c904dc42ef
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: 152715160e
[formerly 152715160e
[formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]
Former-commit-id: 09b5996dac
Former-commit-id: fd95a99596
2013-02-22 12:49:53 -06:00
Dustin Johnson
0d9f121548
Issue #1543 Make DAOs public
...
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a
Former-commit-id: 06b7697553
[formerly 06b7697553
[formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]
Former-commit-id: 0743782772
Former-commit-id: 4e87912a9c
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: 7c62991edf
[formerly 7c62991edf
[formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]
Former-commit-id: d5c8b82941
Former-commit-id: 5a5914c010
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: 1d8ad288b4
[formerly 1d8ad288b4
[formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]
Former-commit-id: 5701309bcb
Former-commit-id: 7c0f1bf788
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: a0573644c4
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Ben Steffensmeier
b8ecbb9387
Issue #1628 lower Xmx on windows in awips.product.
...
Former-commit-id: 62eaf8e947
[formerly 62eaf8e947
[formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 4209a3cfb1
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: a8fb04f41c
[formerly a8fb04f41c
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: 803397c7c7
Former-commit-id: 450e8e7a4c
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: 7dbeeb2684
[formerly 7dbeeb2684
[formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]
Former-commit-id: c6896b5676
Former-commit-id: 4f4932b014
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: a9c4e54287
[formerly a9c4e54287
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: 73f53bd513
Former-commit-id: d7a57d2b34
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: 03c48b2f7a
[formerly 03c48b2f7a
[formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]
Former-commit-id: 297c132c49
Former-commit-id: ff2370221a
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: 2001d916ac
[formerly 2001d916ac
[formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 492df9c238
Former-commit-id: 5d6a7a6140
2013-02-21 09:01:33 -06:00
Steve Harris
654f15be5c
13.3.1-1 baseline
...
Former-commit-id: 0563d7ac18
[formerly 0563d7ac18
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
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: 7f2b4a8092
[formerly 7f2b4a8092
[formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 2f7bf90856
Former-commit-id: a723531b31
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: 46aa0595d8
[formerly 46aa0595d8
[formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]
Former-commit-id: 7d2452e0ef
Former-commit-id: fbaf19e184
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
c46775f84a
Issue #1609 update style rules for msl-P contours
...
Former-commit-id: e7f73db73c
[formerly e7f73db73c
[formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: f029f74a4f
Former-commit-id: 5b9e13aa3d
2013-02-20 17:27:16 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e8990021
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
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: a9e976eed8
[formerly a9e976eed8
[formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]
Former-commit-id: cb1380af90
Former-commit-id: 5031ae4d66
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: 7b36b055f1
[formerly 7b36b055f1
[formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
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: 3b77fe909d
[formerly 3b77fe909d
[formerly 138ccd44e4bc5934bb778c11e5f62036c8d18418]]
Former-commit-id: 6c9bb4366a
Former-commit-id: c1bc9d15ab
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: d0ab7330fc
[formerly d0ab7330fc
[formerly 57e32f0c573791f07e5f801411fb6292fc74d87f]]
Former-commit-id: a9f4bfb079
Former-commit-id: c1fc60a3d1
2013-02-20 15:05:17 -06:00