xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2190 commits 31 branches 40 tags 3.8 GiB
Commit graph

2190 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Duff
f73faee133 Issue #1588 - Fix match any/all in data browser dialog 
Change-Id: I30491d170611f3eec44adcf8b2bd99a445c09a49

Former-commit-id: af47a02e47 [formerly 0d2c817680] [formerly d00a790d7b] [formerly 086d24acc8 [formerly d00a790d7b [formerly b9945e70a6b96a2f4b1c24b2308bb424e4cd7ee5]]]
Former-commit-id: 086d24acc8
Former-commit-id: f34a7712b345b1738f4e1c4927c8c43d0e321466 [formerly 1365596d4d]
Former-commit-id: dccb6b94b9
 2013-02-25 15:53:55 -06:00
Bryan Kowal
f4bf7e1adb Issue #1634 - fix EDEX debug with YAJSW Wrapper 
Change-Id: I7c626e2ff94cfc1c3b71dfe2f22dd69785bb2c96

Former-commit-id: 1ea7fbe69e [formerly 4d160993fb] [formerly b05073fbe3] [formerly 0d2262c0bf [formerly b05073fbe3 [formerly f2d20ea72262c5f6e7c35796606cbd4a093cece6]]]
Former-commit-id: 0d2262c0bf
Former-commit-id: 090c61777cb5dad1fa90214f62e271692c5b167e [formerly 36a887416f]
Former-commit-id: f8c920c6cd
 2013-02-25 11:30:13 -06:00
Dustin Johnson
6b5fdb5672 Merge "Issue #1620 - Fix set clean issue with job loader." into development 
Former-commit-id: 81c261936f [formerly 79718b6a9c] [formerly 83a915210d] [formerly eff20112d2 [formerly 83a915210d [formerly a6bcea8679319fc49f59310b6731e23a00fb8554]]]
Former-commit-id: eff20112d2
Former-commit-id: 77de144645b1acb61a1f55f57de766de97e3ddb8 [formerly 1255b87e2e]
Former-commit-id: b702146272
 2013-02-25 09:43:19 -06:00
Nate Jensen
2924ef9340 Merge "Issue #1617 fixed vb sounding point selection for points which contain the word Point" into development 
Former-commit-id: 4f3ed0ef67 [formerly 5d7edbc0c1] [formerly b514792bbc] [formerly 5d828d4d62 [formerly b514792bbc [formerly 1fec56c55d81b35df45c2266fc234747df3791df]]]
Former-commit-id: 5d828d4d62
Former-commit-id: d6b5c39b47f714b55716489494afc5902a140ab1 [formerly cb37bab362]
Former-commit-id: 3a66566610
 2013-02-25 09:31:55 -06:00
Nate Jensen
32f74cfe32 Merge "Issue #1628 lower Xmx on windows in awips.product." into development 
Former-commit-id: df11a1bc40 [formerly ae20ee7665] [formerly c1becf797a] [formerly 545caf22fb [formerly c1becf797a [formerly 8525b4ac1db570160253cf7bb180914967e0b647]]]
Former-commit-id: 545caf22fb
Former-commit-id: d31418ec7c77062c9087ed4434fdf6776b2c9630 [formerly 87a745eb2f]
Former-commit-id: 530d3bfa00
 2013-02-25 09:31:20 -06:00
Mike Duff
5439b30b6a Issue #1552 - Implement FFMP Data Access 
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 018953526b [formerly 8a8e8f7a73] [formerly 8bddd467b1] [formerly 81649d346a [formerly 8bddd467b1 [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 3908739d5516b0d12bdcb9c95d991ddec48a13d9 [formerly b1a549a99f]
Former-commit-id: 01ef273417
 2013-02-25 09:29:16 -06:00
Steve Harris
30efc4c86a 13.3.1-3 baseline 
Former-commit-id: 4a0eea00b5 [formerly a55f438dd8] [formerly 6572452887] [formerly 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]]
Former-commit-id: 8a64f142e5
Former-commit-id: ef9a242ccd88bfb5175203c6f71d0491e5e16b07 [formerly 8d741715e3]
Former-commit-id: 05eb25f124
 2013-02-25 10:24:53 -05:00
Steve Harris
f2428e968a 13.3.1-2 baseline 
Former-commit-id: 0b3acc0130 [formerly 3e60b23072] [formerly df6d6f598e] [formerly 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]]
Former-commit-id: 3d115ed3be
Former-commit-id: 3d35a57312645a04351b1cba8c83774e80dcc4da [formerly e8a51dc780]
Former-commit-id: 370ed98038
 2013-02-25 10:18:36 -05:00
Mike Duff
421a832657 Issue #1620 - Fix set clean issue with job loader. 
Change-Id: I1cf1e109ae3964ef95ebb9a2582622c31e271028

Former-commit-id: 6753072acf [formerly bfc1e66dfb] [formerly af8b97cd3c] [formerly 3340a9ddd8 [formerly af8b97cd3c [formerly c436049a244e3a7c0c7fb629673d8f15c46c72a8]]]
Former-commit-id: 3340a9ddd8
Former-commit-id: 55cd27a63897002d693beca349d622a730a08c37 [formerly c904dc42ef]
Former-commit-id: 9e177f44cd
 2013-02-24 19:13:57 -06:00
Roger Ferrel
82804ac8bb Issue #1442 Fix null pointer exception in DecisonTree's searchTree 
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 4337d23872 [formerly 07a103c3bb] [formerly 152715160e] [formerly 09b5996dac [formerly 152715160e [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]
Former-commit-id: 09b5996dac
Former-commit-id: 3f8334cdb8bbe5133624435d74cf48b95e4f2493 [formerly fd95a99596]
Former-commit-id: 186c71e5ac
 2013-02-22 12:49:53 -06:00
Dustin Johnson
637c7e62c2 Issue #1543 Make DAOs public 
Change-Id: I7002ff6db38e7daa9453f11e46a2e5adbb919f7a

Former-commit-id: 5a4dd6fbd1 [formerly d4186178af] [formerly 06b7697553] [formerly 0743782772 [formerly 06b7697553 [formerly a4bb7967b92977d21c9bea34fc5adc883ceb68c1]]]
Former-commit-id: 0743782772
Former-commit-id: 0129926124bc6953a319174f4ae9c67d11da1444 [formerly 4e87912a9c]
Former-commit-id: a1df296e80
 2013-02-22 12:22:43 -06:00
Bryan Kowal
ec53fa98cd Issue #1634 - force added wrapper jars in bin directory 
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]
Former-commit-id: 53b9e69868
 2013-02-22 09:28:37 -06:00
Ben Steffensmeier
3dd76fdb04 Issue #1617 fixed vb sounding point selection for points which contain the word Point 
Former-commit-id: 581c8ffcd5 [formerly be95659d4a] [formerly 1d8ad288b4] [formerly 5701309bcb [formerly 1d8ad288b4 [formerly d2aa45b1fb765ae3f24d96b39b789195d5c607ed]]]
Former-commit-id: 5701309bcb
Former-commit-id: fded4c4c5e2d488ca4c56730b284454ede5f92c1 [formerly 7c0f1bf788]
Former-commit-id: 2892e64677
 2013-02-21 16:28:41 -06:00
Steve Harris
7e48d3e684 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: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
 2013-02-21 15:41:39 -06:00
Ben Steffensmeier
45bde9d742 Issue #1628 lower Xmx on windows in awips.product. 
Former-commit-id: cb45175375 [formerly 86f30a647d] [formerly 62eaf8e947] [formerly 0bb2c03a83 [formerly 62eaf8e947 [formerly 39d24c906c0aae925b9c472569c1d9e99dbd6021]]]
Former-commit-id: 0bb2c03a83
Former-commit-id: 8b8fa33b6ea614af1b029854cb81e6b6be529d48 [formerly 4209a3cfb1]
Former-commit-id: dd2d3da9bb
 2013-02-21 14:30:41 -06:00
Bryan Kowal
6a47017449 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: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]
Former-commit-id: b2a0a7c148
 2013-02-21 13:55:28 -06:00
Nate Jensen
b423cd4d70 Merge "Issue #1628 clean up Inflaters used by HttpClient." into development 
Former-commit-id: ec0dd8d234 [formerly b2f7cbcbe3] [formerly 7dbeeb2684] [formerly c6896b5676 [formerly 7dbeeb2684 [formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]]
Former-commit-id: c6896b5676
Former-commit-id: 97c5442369f13721659c1b0c23d03bc01ac6815a [formerly 4f4932b014]
Former-commit-id: 533deac8d0
 2013-02-21 11:47:00 -06:00
Nate Jensen
e19664ab18 Merge "Issue #1635 Second Guidance source verification, general cleanup" into development 
Former-commit-id: a8e81097fc [formerly 033b9e3852] [formerly a9c4e54287] [formerly 73f53bd513 [formerly a9c4e54287 [formerly 25ecfc3e6199294275abc8547c482388c55be724]]]
Former-commit-id: 73f53bd513
Former-commit-id: 82a8e0c1fe20524fc0676db0dbd1c0079f46a300 [formerly d7a57d2b34]
Former-commit-id: 6f9d3f55e5
 2013-02-21 11:41:52 -06:00
Ron Anderson
bcc9d63d9c Merge "Issue #1506 fix for GFE evaluateRefSet() for non-queries" into development 
Former-commit-id: 1661ad92f7 [formerly e6ec21bd53] [formerly 03c48b2f7a] [formerly 297c132c49 [formerly 03c48b2f7a [formerly 4397b9cad2c75e5d4fa3a1933394fadc8460153a]]]
Former-commit-id: 297c132c49
Former-commit-id: 53f8f259a85445c95a55275d90e6cf60b6620316 [formerly ff2370221a]
Former-commit-id: e61af5611a
 2013-02-21 09:10:07 -06:00
Matt Nash
eec2ea4c29 Issue #1506 fix for GFE evaluateRefSet() for non-queries 
Change-Id: I342ce5c5e0449b7f5f4f81865705ed55aff3c5a7

Former-commit-id: 0531052a2e [formerly 6f9621adb2] [formerly 2001d916ac] [formerly 492df9c238 [formerly 2001d916ac [formerly 2f9911c6e28fd3b5617353ec8de80c16f812c508]]]
Former-commit-id: 492df9c238
Former-commit-id: 210f7f89643e818406eeea19775de2c66f16305d [formerly 5d6a7a6140]
Former-commit-id: 84f3da4828
 2013-02-21 09:01:33 -06:00
Steve Harris
96c7269df0 13.3.1-1 baseline 
Former-commit-id: 9bdd52a626 [formerly 96768407a5] [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]]
Former-commit-id: cabc8cf8b4
Former-commit-id: c69f91c8e87239b610a4a8da6e4238eb3011b229 [formerly 92e4c7ba19]
Former-commit-id: 0569ff413d
 2013-02-21 09:36:59 -05:00
Steve Harris
6168846b97 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: f55ea02607 [formerly f5bd250026] [formerly 7f2b4a8092] [formerly 2f7bf90856 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]]
Former-commit-id: 2f7bf90856
Former-commit-id: 224ac801b740bcfa7e8f8edee78de977ecae225d [formerly a723531b31]
Former-commit-id: 87bd35250c
 2013-02-21 09:25:27 -05:00
Lee Venable
1f81a1c057 Merge "Issue #1609 update style rules for msl-P contours" into development 
Former-commit-id: e83cd69075 [formerly b82961dda2] [formerly 46aa0595d8] [formerly 7d2452e0ef [formerly 46aa0595d8 [formerly cb89924d5a8a751bd96fdfa3e2ccbed74c3ba815]]]
Former-commit-id: 7d2452e0ef
Former-commit-id: bc9255bcfe995e0997dcec117989f12c5ada3a41 [formerly fbaf19e184]
Former-commit-id: 997cebb2df
 2013-02-20 18:03:30 -06:00
Ben Steffensmeier
070d80adf5 Issue #1609 update style rules for msl-P contours 
Former-commit-id: bf9f3344d1 [formerly 6bf304ab80] [formerly e7f73db73c] [formerly f029f74a4f [formerly e7f73db73c [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]]
Former-commit-id: f029f74a4f
Former-commit-id: f250772b236ea3b33c3494e51227e59db759d9a3 [formerly 5b9e13aa3d]
Former-commit-id: 894c7e7e62
 2013-02-20 17:27:16 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline 
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
 2013-02-20 16:19:40 -06:00
Dustin Johnson
18cfc1ee4d 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: 8256f182c2 [formerly b6602f9468] [formerly a9e976eed8] [formerly cb1380af90 [formerly a9e976eed8 [formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]]
Former-commit-id: cb1380af90
Former-commit-id: 48d8590ebfaa96f41ee4b9def3d4c9a8b17d1c3c [formerly 5031ae4d66]
Former-commit-id: f552967bf3
 2013-02-20 16:17:20 -06:00
Dave Hladky
f439b63316 Issue #1635 Second Guidance source verification, general cleanup 
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: fdfbf59dba [formerly e7993c968d] [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 7b36b055f1 [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 1169eb8cd11a2b8565eaf5607902f6898450127b [formerly b1c8f153e0]
Former-commit-id: 261d00c544
 2013-02-20 16:13:08 -06:00
Dustin Johnson
498f5a1328 Merge "Issue #1589 - Fix saving of custom subset areas in spatial subset tab" into development 
Former-commit-id: a014a486e5 [formerly 9479ab8dad] [formerly 3b77fe909d] [formerly 6c9bb4366a [formerly 3b77fe909d [formerly 138ccd44e4bc5934bb778c11e5f62036c8d18418]]]
Former-commit-id: 6c9bb4366a
Former-commit-id: 652e7e3488efe8f1f6975587d3c93db3bfc53357 [formerly c1bc9d15ab]
Former-commit-id: 511056a15c
 2013-02-20 15:39:00 -06:00
Lee Venable
c6407266f7 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: eeeb47fa52 [formerly 2d3dc0aa3f] [formerly d0ab7330fc] [formerly a9f4bfb079 [formerly d0ab7330fc [formerly 57e32f0c573791f07e5f801411fb6292fc74d87f]]]
Former-commit-id: a9f4bfb079
Former-commit-id: 3ac0a54da8328f7bb512e1d54a5879cc77e7eedd [formerly c1fc60a3d1]
Former-commit-id: baf93a7875
 2013-02-20 15:05:17 -06:00
Mike Duff
9556ed337a Issue #1589 - Fix saving of custom subset areas in spatial subset tab 
Change-Id: I4143de4c3ab78a6da4de407d9035e70e264fe95a

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

Former-commit-id: 376a966852 [formerly e0884ed550] [formerly c2d4f8e164] [formerly e6e2d8905c [formerly c2d4f8e164 [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]
Former-commit-id: e6e2d8905c
Former-commit-id: 7a4a9a6467cfdc2321c93cb906bc1f8119346908 [formerly a7b74e1f79]
Former-commit-id: f5a1165062
 2013-02-20 13:48:26 -06:00
Ben Steffensmeier
9d34dce3de Issue #1628 clean up Inflaters used by HttpClient. 
Former-commit-id: 8cb150a0e9 [formerly 0e9226b5f5] [formerly ef2dd2a031] [formerly e2efad85fe [formerly ef2dd2a031 [formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]]]
Former-commit-id: e2efad85fe
Former-commit-id: 8365e04958c1ccf70f03afee22501ef446beba5f [formerly 2debab14f5]
Former-commit-id: 0f1057cb3d
 2013-02-20 12:58:13 -06:00
Roger Ferrel
672a979183 Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools. 
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f

Former-commit-id: c0df401088 [formerly acfccac971] [formerly 8baa3b6df5] [formerly dd05bc65be [formerly 8baa3b6df5 [formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]]
Former-commit-id: dd05bc65be
Former-commit-id: bb8e979b980b2c5128f11b8e520f639e237ea72a [formerly 8264adc47d]
Former-commit-id: e47c91eda7
 2013-02-20 12:09:26 -06:00
Dustin Johnson
0c7c2a6abd 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.

Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa

Former-commit-id: 597908f34d [formerly d4afef2cab] [formerly d8659e742e] [formerly c8760e5699 [formerly d8659e742e [formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]]
Former-commit-id: c8760e5699
Former-commit-id: f672d4337c7763a3c1b36a4e134928216fc2dff2 [formerly ca721863be]
Former-commit-id: 5a8b6459d4
 2013-02-20 10:42:51 -06:00
Ron Anderson
c0364ee665 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development 
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]
Former-commit-id: 744391e3f6
 2013-02-19 18:46:16 -06:00
Ben Steffensmeier
9c889bcc37 Issue #1598 fix GridParamInfo keys. 
Former-commit-id: 4370018cbf [formerly 7d4b065a23] [formerly 1ab9f7bd1f] [formerly c1b8ceecf1 [formerly 1ab9f7bd1f [formerly 33da1c48a76b468b9fee4e05de835295c7393672]]]
Former-commit-id: c1b8ceecf1
Former-commit-id: a3eea6c6923a0758fd9d051e07105c75b85536a9 [formerly 48e6ffe392]
Former-commit-id: cde7275a2a
 2013-02-19 14:06:26 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
 2013-02-19 12:22:00 -06:00
Steve Harris
c9f047421b Merge branch 'omaha_13.2.1' (13.2.1-7) into development 
Conflicts resolved by 'ours' strategy (all of development)

Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/SetTimeMatchBasisAction.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/bandwidth/ui/GraphDataUtil.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/ArealSelectionDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/IDataLoad.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionDiff.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/utils/DataDeliveryUtils.java
	cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/actions/DisplayAttributes.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/BasinTrendDlg.java
	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/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsRoleDataManager.java
	cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/alertalarm/AlertAlarmValuesDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DisplayMeanArealPrecipResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/TimeLapseResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/XmrgResource.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/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.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
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FipsUtil.java
	cots/net.dods/.classpath
	cots/net.dods/src/dods/dap/DAS.java
	cots/net.dods/src/dods/dap/DConnect.java
	cots/net.dods/src/dods/dap/DDS.java
	cots/net.dods/src/dods/dap/DataDDS.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/ParameterInfo.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AKwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AWCicgturb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/AkNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlook211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookMedium_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/CPCoutlookShort_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/EPwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GRLKwave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/GlobalWave.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HIrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HPCqpfNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-arwWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmAK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmEast.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmHI.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmSJU.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/HiResW-nmmWest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/NamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PRrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PrNamDNG5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm175.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm226.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCtcm250.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WCwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave10.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/WNAwave4.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aKrtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/aiv211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/akWave239.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avn225.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/avnNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex185.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/dgex186.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmfNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/enpWave253.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ensembleNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/eta242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/fcst.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfe.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs160.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs161.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfs254.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gfsGuide232.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/glerl.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/gww233.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcDelta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/lampNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/laps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localBHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localDHM.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localHPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/localMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/maps40.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta215.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mesoEta217.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mm5.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mosGuideNDFD_AK.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf201.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf203.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf204.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf205.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/mrf213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/msas.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm213.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nic242.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/nogaps.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave180.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave181.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/opcWave182.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rfcMPE.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/roc_rams.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rsmMerc10km.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgsst235.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtgssthr173.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/rtmaNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc130.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ruc236.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/seaIce219.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sfm.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/spcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref216.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/sref243.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/tpcWind231.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/turb212.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetGBL.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ukmetNH.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/wnaWave238.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefFilter.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/DataRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.event/src/com/raytheon/uf/common/datadelivery/event/retrieval/SubscriptionRetrievalEvent.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/GriddedCoverage.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/Subscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.request/src/com/raytheon/uf/common/datadelivery/request/user/AuthenticationData.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/LevelLookup.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/Retrieval.java
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/src/com/raytheon/uf/common/datadelivery/retrieval/xml/RetrievalAttribute.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPAggregateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPGuidanceBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/GeometryUtil.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/EnvelopeIntersection.java
	edexOsgi/com.raytheon.uf.common.hydro/res/spring/hydro-common.xml
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroGeometryFactory.java
	edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/dataaccess/HydroQueryAssembler.java
	edexOsgi/com.raytheon.uf.common.image/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.pypies/src/com/raytheon/uf/common/pypies/PyPiesDataStore.java
	edexOsgi/com.raytheon.uf.common.python/src/com/raytheon/uf/common/python/PythonNumpyFloatArray.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/RegistryStatisticsEvent.java
	edexOsgi/com.raytheon.uf.common.registry.event/src/com/raytheon/uf/common/registry/event/UpdateRegistryEvent.java
	edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/lcm/v4/package-info.java
	edexOsgi/com.raytheon.uf.common.stats/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthGraphDataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthContextFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/IBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/InMemoryBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/BandwidthAllocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/IBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrieval.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthDbInit.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/interfaces/ISubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthAsyncEventBusFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/notification/BandwidthEventBus.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/processing/SimpleSubscriptionAggregator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalAgentManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/RetrievalPlan.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/retrieval/SubscriptionRetrievalAgent.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/AveragingAvailablityCalculator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.event/src/com/raytheon/uf/edex/datadelivery/event/handler/NotificationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/CrawlMetaDataHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/.classpath
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/res/spring/retrieval-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/RetrievalGenerationHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/ServiceTypeFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/adapters/RetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecord.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalRequestRecordPK.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/handlers/SubscriptionNotifyTask.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/interfaces/IRetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/metadata/adapters/GridMetadataAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPRetrievalAdapter.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDapServiceFactory.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/OpenDAPTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalResponse.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalTranslator.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/ResponseProcessingUtilities.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/BaseSubscriptionVerifier.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/NotifyFailedVerification.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifier.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/StaticTopoData.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/topo/TopoAttributes.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPInterpolatedGuidanceDelay.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-common.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-impl.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-web.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/DoubleMultiply.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/acp/xacml/engine/function/impl/package-info.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionContext.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/util/RegistrySessionManager.java
	edexOsgi/com.raytheon.uf.edex.stats/utility/edex_static/base/stats/edexProcessStats.xml
	nativeLib/org.apache.qpid/include/qpid/types/Exception.h
	nativeLib/org.apache.qpid/lib/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib/libqpidtypes.so.1.1.1
	nativeLib/org.apache.qpid/lib64/libqpidclient.so
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4
	nativeLib/org.apache.qpid/lib64/libqpidclient.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4
	nativeLib/org.apache.qpid/lib64/libqpidcommon.so.4.0.0
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3
	nativeLib/org.apache.qpid/lib64/libqpidmessaging.so.3.0.2
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1
	nativeLib/org.apache.qpid/lib64/libqpidtypes.so.1.1.1
	nativeLib/org.apache.thrift/lib/libthrift.so
	nativeLib/org.apache.thrift/lib/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthrift.so
	nativeLib/org.apache.thrift/lib64/libthrift.so.0
	nativeLib/org.apache.thrift/lib64/libthrift.so.0.0.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0
	nativeLib/org.apache.thrift/lib64/libthriftz.so.0.0.0
	ncep/gov.noaa.nws.ncep.viz.gempak/localization/ncep/GempakGridUnits/gempakGridVcrdUnits.xml
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	tests/.classpath
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManagerIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthServiceIntTest.java
	tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestBandwidthContextFactory.java
	tests/resources/bandwidth/bandwidth-datadelivery-integrationtest-impl.xml
	tests/resources/unit-test-db-beans.xml
	tests/resources/unit-test-hibernate.cfg.xml
	tests/unit/com/raytheon/uf/common/datadelivery/registry/BaseSubscriptionFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/DataSetMetaDataTest.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/LevelsFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ParameterFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/ProviderFixture.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/SubscriptionBuilder.java
	tests/unit/com/raytheon/uf/common/datadelivery/registry/TimeFixture.java
	tests/unit/com/raytheon/uf/common/serialization/SerializationUtilTest.java
	tests/unit/com/raytheon/uf/common/time/SimulatedTimeTest.java
	tests/unit/com/raytheon/uf/common/util/Matchers.java
	tests/unit/com/raytheon/uf/common/util/session/SessionManagerTest.java
	tests/unit/com/raytheon/uf/edex/database/dao/DatabaseUtil.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/AbstractBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/HibernateBandwidthDaoTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/DataSetMetaDataDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionDaoFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/dao/SubscriptionRetrievalFixture.java
	tests/unit/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtilTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/handlers/RetrievalHandlerTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserNCOMTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPMetaDataParserRAPTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/retrieval/opendap/OpenDAPParseUtilityTest.java
	tests/unit/com/raytheon/uf/edex/datadelivery/service/verify/SubscriptionIntegrityVerifierTest.java
	tests/unit/com/raytheon/uf/edex/stats/MockEvent.java

Former-commit-id: b277e2539c [formerly e0a0e0df3c] [formerly ac24fa5bff0529b1a0a40d61283f6197c2d8bd70 [formerly b96a90bdbd]] [formerly 16db86df12 [formerly b96a90bdbd [formerly f3c152674265b2142e61a306c3f4815b02000e1d]]]
Former-commit-id: 16db86df12
Former-commit-id: d26a2e03cc0e3baaec93843d16407ceed94c780e [formerly 6ba2455892]
Former-commit-id: abbb5ad21c
 2013-02-19 12:20:06 -06:00
Dustin Johnson
8d32c1ee00 Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes 
Amend:
   Use ref syntax with uri.

Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062

Former-commit-id: 8532c28461 [formerly 2a588688b1] [formerly cc598094fa] [formerly 116809346b [formerly cc598094fa [formerly 66fe560026848357ae165a675be9818da719675d]]]
Former-commit-id: 116809346b
Former-commit-id: fa68e8e6e2aeab2fdd4a5f732b9524d93c0d5e1a [formerly 3585482cad]
Former-commit-id: 5ff6387368
 2013-02-18 15:47:17 -06:00
Richard Peter
24f36419b3 Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development 
Former-commit-id: 9b9579d252 [formerly 83d12549bf] [formerly 77157e3c6c] [formerly f364af584d [formerly 77157e3c6c [formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]]
Former-commit-id: f364af584d
Former-commit-id: 6929b91f2a2d234b16abab0c3bdda8ad2a62bffb [formerly 623020926e]
Former-commit-id: d42a0b9f0d
 2013-02-18 15:36:41 -06:00
Dustin Johnson
cd9e4ac668 Merge "Issue #1543 Use XML to represent retrieval - Only include request identifier for serialized retrieval data - RetrievalAttributes are now retrieved from the database - Remove plugin data objects from class names - Add retrievalDao to retrieval task constructor" into development 
Former-commit-id: 46f389b423 [formerly c1e20611d5] [formerly 7392aab40c] [formerly de8e371471 [formerly 7392aab40c [formerly e2b704d27ce7b4d9e2d3ac86ef5081eeb844d96c]]]
Former-commit-id: de8e371471
Former-commit-id: 0abd5ce0eeef017c05d6d64edf37aa593e883c19 [formerly 0cf2c65afa]
Former-commit-id: 73620cf82f
 2013-02-18 13:20:53 -06:00
Dustin Johnson
3110a88e0c Issue #1543 Use XML to represent retrieval 
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor

Amend:
   Add call-through method to prepare for serialization.

Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d

Former-commit-id: dc3b521846 [formerly f16c1507d0] [formerly 437a168b50] [formerly 62a84aea76 [formerly 437a168b50 [formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]]
Former-commit-id: 62a84aea76
Former-commit-id: 9b75194ff411af8419ede2a4c14daf3b155c88ab [formerly db3a9d8f19]
Former-commit-id: 6f94c035e8
 2013-02-18 13:05:41 -06:00
Steve Harris
180a1877d2 Merge branch 'master_13.2.1' into master_13.3.1 
Former-commit-id: af78b95ef2 [formerly bbc1b6fb55] [formerly 1b631ebb9a] [formerly b29c0b805f [formerly 1b631ebb9a [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]]
Former-commit-id: b29c0b805f
Former-commit-id: 3de33935491ec507a0f77bd19520d42341e201f1 [formerly 15e9481838]
Former-commit-id: 9a90ba3d07
 2013-02-18 12:39:53 -06:00
Roger Ferrel
317076ce71 Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time. 
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869

Former-commit-id: 28b0f753fc [formerly a2e61d32a1] [formerly bdf58f534a1e9f71e4fb55fa7da4a957cb84b42d [formerly 1b693994a5]] [formerly 1d51a10f4b [formerly 1b693994a5 [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 1c5d3ed74cec47761bf7aea165a116a3c8bbdfbb [formerly 211a39c333]
Former-commit-id: 94eb5757b5
 2013-02-18 12:15:39 -06:00
Ben Steffensmeier
f945303603 Issue #1598 Make GridParamInfoLookup filter on extension. 
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744

Former-commit-id: 46d8c78abd [formerly efc1335b1f] [formerly 63a725718d] [formerly d2e17d1473 [formerly 63a725718d [formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]]
Former-commit-id: d2e17d1473
Former-commit-id: 11155351011bccb8beb1a89d0e39e1bd4e8881b5 [formerly 5ada0b2c2a]
Former-commit-id: 47090eccc1
 2013-02-18 10:36:47 -06:00
Steve Harris
435be40166 Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1 
Former-commit-id: fcef63a7af [formerly b8720e185d] [formerly 1874b07ab4] [formerly 6318348e3b [formerly 1874b07ab4 [formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]
Former-commit-id: 6318348e3b
Former-commit-id: b6bfbd19eba2539cd1cfc863faeaf188664f3a8f [formerly 4777c782e2]
Former-commit-id: 85fa1539ef
 2013-02-18 09:52:22 -06:00
Richard Peter
c7c54b9f8c Merge "Issue #1630 updated chunk size for single dimension chunks." into development 
Former-commit-id: 0005aa9bce [formerly 3ad71676b3] [formerly 6beaa1e8ae] [formerly 14c2a2b201 [formerly 6beaa1e8ae [formerly 010d73f684ec58affd0aeffcef64c6904f909bef]]]
Former-commit-id: 14c2a2b201
Former-commit-id: a114ded4dea0799dd8426dcf816e1f37692a766a [formerly 0a47749664]
Former-commit-id: 13cb57b378
 2013-02-18 09:44:36 -06:00
Steve Harris
6c16384c5c Issue #1632 - new FOSS licenses added for Data Delivery plugins 
Former-commit-id: 0e7cd27efc [formerly 049c219f2b] [formerly 02ec634536] [formerly b9ce5b8b35 [formerly 02ec634536 [formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 93562620757b43bfd2d1bd9159c4db359d64f1ad [formerly 3c3681420e]
Former-commit-id: 7a9501de55
 2013-02-18 09:39:31 -06:00
Richard Peter
9c0ff50ba0 Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development 
Former-commit-id: 05f5f4daf3 [formerly 3c126b0ab1] [formerly 355e6d2c67] [formerly 4fb1cb27dc [formerly 355e6d2c67 [formerly a07a434ad71986aa4b474dd88e266035e347efa4]]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 434b4343506bf7b287825895ce602614fe47b40d [formerly 8991c1c86d]
Former-commit-id: 4f3d9ab931
 2013-02-18 09:35:53 -06:00
Brad Gonzales
0e60e11fbb Issue #1630 updated chunk size for single dimension chunks. 
Amend: check if dataType is vlen_str_type.

Change-Id: Idbd39e8bcd6c2703299277b073e14b106c897ccb

Former-commit-id: a64625383f [formerly f8b4dcc541] [formerly 4c706901f8] [formerly 691b9d7ca2 [formerly 4c706901f8 [formerly 25bd6d76b85b3c857958f1fc5189f9512420daea]]]
Former-commit-id: 691b9d7ca2
Former-commit-id: e271a0ffc64b57ea2a58cefa0886aac6140d7847 [formerly b9b660535c]
Former-commit-id: 1ce25acbc5
 2013-02-18 09:29:21 -06:00