Commit graph

2108 commits

Author SHA1 Message Date
Dustin Johnson
5f4301cb7f Merge "Issue #1592 Don't submit adhoc query when X button clicked" into development
Former-commit-id: d31392d740 [formerly 47cb278c01 [formerly bf86849d284696553ed4cbc3f347afe2f791968d]]
Former-commit-id: 47cb278c01
Former-commit-id: 074fb0aa64
2013-02-26 13:41:46 -06:00
Dustin Johnson
256e2076a2 Merge "Issue #1643 Add NCF bandwidth manager router" into development
Former-commit-id: fb235e3f43 [formerly 42402c5d73 [formerly e2bb08df9a9aa2ac143e0f7fc82b911f72b4b87c]]
Former-commit-id: 42402c5d73
Former-commit-id: 50b412b34e
2013-02-26 13:41:36 -06:00
Dustin Johnson
ab8506bab4 Merge "Issue #1588 - Fix match any/all in data browser dialog" into development
Former-commit-id: 76738dbf7d [formerly fb38cceecd [formerly 00e1133e53664a0b8a22a17ca5880736a0f93502]]
Former-commit-id: fb38cceecd
Former-commit-id: 3dd36d29cf
2013-02-26 13:37:14 -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
Matt Nash
f18955a1ed Issue #1506 fix deadlock and edit areas showing up from query
Change-Id: I1a8f8adbb4a6e737c06a6c906cd4db0926254b49

Former-commit-id: b749edca54 [formerly c728f72ea3 [formerly 5fd67088da350141cc97d90346272843dfc7ff5d]]
Former-commit-id: c728f72ea3
Former-commit-id: 4be89bdd43
2013-02-26 12:20:08 -06:00
Dustin Johnson
0ba5133583 Issue #1592 Don't submit adhoc query when X button clicked
Change-Id: I7a06857fa64a6d54279ec2dca1404062179fe279

Former-commit-id: c6975aa379 [formerly 598eb88a04 [formerly 9cb2114c239e6782961e8127fe85b10a7ee38f06]]
Former-commit-id: 598eb88a04
Former-commit-id: 604a7c82b2
2013-02-26 12:07:36 -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
82d50b3eb6 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 098b1e1579 [formerly 9bcabe2c5d [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 9bcabe2c5d
Former-commit-id: 7ed1eacb6b
2013-02-25 20:41:26 -06:00
Richard Peter
2a69ad78b6 Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development
Former-commit-id: 1669945cdb [formerly be9370576a [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]]
Former-commit-id: be9370576a
Former-commit-id: 2553955249
2013-02-25 17:47:14 -06:00
Richard Peter
2e15dd3a75 Merge "Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests." into development
Former-commit-id: 3b718bea52 [formerly b98bdb3d81 [formerly bedfb6a21680961421b42bcbcec470e41bb9523d]]
Former-commit-id: b98bdb3d81
Former-commit-id: af33dd1743
2013-02-25 17:46:26 -06:00
Lee Venable
0be080c78b Merge "Issue #1625 Updated addOrRemoveCounty method." into development
Former-commit-id: 7f769af427 [formerly e024e4e087 [formerly cda14b7c5e6563a9165fa734f35766816bccccf1]]
Former-commit-id: e024e4e087
Former-commit-id: e54eb4ab55
2013-02-25 17:25:56 -06:00
Jonathan Sanchez
4ee3a8d412 Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: 8c2c7c97f7 [formerly cd6dd3c178 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: cd6dd3c178
Former-commit-id: f59a08963c
2013-02-25 17:15:09 -06:00
Ben Steffensmeier
ab23c25b35 Issue #1659 Stop derived parameters from sending empty requests for cached times
Former-commit-id: 9edeadc966 [formerly 71652af086 [formerly 9605118022d378eb35c38d784729410d160d46df]]
Former-commit-id: 71652af086
Former-commit-id: ff232b87b4
2013-02-25 17:08:12 -06:00
Ben Steffensmeier
92954639db Issue #1659 Add PDOs to D2DGridResource in constructor to avoid duplicate data requests.
Former-commit-id: 2fa5fb488e [formerly fd2450c0df [formerly 4826ccdd4db42342f913cfc9e9fef6bc276dcea9]]
Former-commit-id: fd2450c0df
Former-commit-id: f56b305581
2013-02-25 16:58:25 -06:00
Nate Jensen
02b52de3ce Merge "Issue #1659 Cache station in StationUtils" into development
Former-commit-id: 66e1411de1 [formerly bbbdc17c06 [formerly 70f064bed284629fe521ac8d3596cb8ac798c0c7]]
Former-commit-id: bbbdc17c06
Former-commit-id: c7d01eb0c5
2013-02-25 16:56:55 -06:00
Ben Steffensmeier
98ec05e12c Issue #1659 Cache station in StationUtils
Former-commit-id: 39bf907df7 [formerly 842437870e [formerly 5bd8303893ad59a23571c0564984b21da9ffe785]]
Former-commit-id: 842437870e
Former-commit-id: 0ff907499c
2013-02-25 16:25:55 -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
Steve Harris
786642589b 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: db761c0f19 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: cf951785c8
Former-commit-id: 07167ec04f
2013-02-25 15:54:24 -06:00
Mike Duff
af47a02e47 Issue #1588 - Fix match any/all in data browser dialog
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: 086d24acc8 [formerly d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]
Former-commit-id: d00a790d7b
Former-commit-id: 0d2c817680
2013-02-25 15:53:55 -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
Dustin Johnson
81c261936f Merge "Issue #1620 - Fix set clean issue with job loader." into development
Former-commit-id: eff20112d2 [formerly 83a915210d [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]
Former-commit-id: 83a915210d
Former-commit-id: 79718b6a9c
2013-02-25 09:43:19 -06:00
Nate Jensen
4f3ed0ef67 Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development
Former-commit-id: 5d828d4d62 [formerly b514792bbc [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]
Former-commit-id: b514792bbc
Former-commit-id: 5d7edbc0c1
2013-02-25 09:31:55 -06:00
Nate Jensen
df11a1bc40 Merge "Issue #1628 lower Xmx on windows in awips.product." into development
Former-commit-id: 545caf22fb [formerly c1becf797a [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]
Former-commit-id: c1becf797a
Former-commit-id: ae20ee7665
2013-02-25 09:31:20 -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
Mike Duff
6753072acf Issue #1620 - Fix set clean issue with job loader.
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028

Former-commit-id: 3340a9ddd8 [formerly af8b97cd3c [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]
Former-commit-id: af8b97cd3c
Former-commit-id: bfc1e66dfb
2013-02-24 19:13:57 -06:00
Roger Ferrel
4337d23872 Issue #1442 Fix null pointer exception in DecisonTree's searchTree
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 09b5996dac [formerly 152715160e [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]
Former-commit-id: 152715160e
Former-commit-id: 07a103c3bb
2013-02-22 12:49:53 -06: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
Ben Steffensmeier
581c8ffcd5 Issue #1617 fixed vb sounding point selection for points which contain the word Point
Former-commit-id: 5701309bcb [formerly 1d8ad288b4 [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]
Former-commit-id: 1d8ad288b4
Former-commit-id: be95659d4a
2013-02-21 16:28:41 -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
Ben Steffensmeier
cb45175375 Issue #1628 lower Xmx on windows in awips.product.
Former-commit-id: 0bb2c03a83 [formerly 62eaf8e947 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]
Former-commit-id: 62eaf8e947
Former-commit-id: 86f30a647d
2013-02-21 14:30:41 -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
Ron Anderson
1661ad92f7 Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development
Former-commit-id: 297c132c49 [formerly 03c48b2f7a [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]
Former-commit-id: 03c48b2f7a
Former-commit-id: e6ec21bd53
2013-02-21 09:10:07 -06:00
Matt Nash
0531052a2e Issue #1506 fix for GFE evaluateRefSet() for non-queries
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 492df9c238 [formerly 2001d916ac [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]
Former-commit-id: 2001d916ac
Former-commit-id: 6f9621adb2
2013-02-21 09:01:33 -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
f55ea02607 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: 2f7bf90856 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 7f2b4a8092
Former-commit-id: f5bd250026
2013-02-21 09:25:27 -05:00
Lee Venable
e83cd69075 Merge "Issue #1609 update style rules for msl-P contours" into development
Former-commit-id: 7d2452e0ef [formerly 46aa0595d8 [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]
Former-commit-id: 46aa0595d8
Former-commit-id: b82961dda2
2013-02-20 18:03:30 -06:00
Ben Steffensmeier
bf9f3344d1 Issue #1609 update style rules for msl-P contours
Former-commit-id: f029f74a4f [formerly e7f73db73c [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: e7f73db73c
Former-commit-id: 6bf304ab80
2013-02-20 17:27:16 -06: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
Dustin Johnson
8256f182c2 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: cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]
Former-commit-id: a9e976eed8
Former-commit-id: b6602f9468
2013-02-20 16:17:20 -06:00
Dave Hladky
fdfbf59dba Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 7b36b055f1
Former-commit-id: e7993c968d
2013-02-20 16:13:08 -06:00
Dustin Johnson
a014a486e5 Merge "Issue #1589 - Fix saving of custom subset areas in spatial subset tab" into development
Former-commit-id: 6c9bb4366a [formerly 3b77fe909d [formerly 138ccd44e4bc5934bb778c11e5f62036c8d18418]]
Former-commit-id: 3b77fe909d
Former-commit-id: 9479ab8dad
2013-02-20 15:39:00 -06:00
Lee Venable
eeeb47fa52 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: a9f4bfb079 [formerly d0ab7330fc [formerly 57e32f0c573791f07e5f801411fb6292fc74d87f]]
Former-commit-id: d0ab7330fc
Former-commit-id: 2d3dc0aa3f
2013-02-20 15:05:17 -06:00
Mike Duff
9dfaee98a1 Issue #1589 - Fix saving of custom subset areas in spatial subset tab
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a

Former-commit-id: f845137930 [formerly 1511490c55 [formerly 09e0a2450e8e1c860ae3e8d6354320cc0b2b6d88]]
Former-commit-id: 1511490c55
Former-commit-id: 4c47ee820d
2013-02-20 14:57:58 -06:00
Nate Jensen
376a966852 Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: e6e2d8905c [formerly c2d4f8e164 [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]
Former-commit-id: c2d4f8e164
Former-commit-id: e0884ed550
2013-02-20 13:48:26 -06:00