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

637 commits

Author SHA1 Message Date
Richard Peter
20fa07c6d3 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: 8de1ebcb65 [formerly 2457d0e6f7 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]
Former-commit-id: 2457d0e6f7
Former-commit-id: 23eafaba3d
 2014-12-12 10:36:04 -06:00
Bryan Kowal
1249cd8a28 Omaha #3914 - increment yajsw release 
Former-commit-id: 0b65eb314d [formerly aad5e554b9 [formerly 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a]]
Former-commit-id: aad5e554b9
Former-commit-id: c2e0b33c19
 2014-12-10 10:34:26 -06:00
Bryan Kowal
121f1068ca Omaha #3508 - remove references to yajsw in %files 
Former-commit-id: 9e77b9635e [formerly 9e55db1c52 [formerly 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9]]
Former-commit-id: 9e55db1c52
Former-commit-id: 16a33efd8b
 2014-12-05 10:04:42 -06:00
Bryan Kowal
4aaf636e18 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]
Former-commit-id: 19f6551c88
Former-commit-id: 289689e774
 2014-12-05 09:20:23 -06:00
Greg Armendariz
1a012a8f2f Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1 
Former-commit-id: 610f38e9ef [formerly 8803a6b658 [formerly 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23]]
Former-commit-id: 8803a6b658
Former-commit-id: f6f50778c7
 2014-12-05 08:57:37 -06:00
Greg Armendariz
7bced64c28 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1 
Former-commit-id: ed42ecc0e8 [formerly 83ca3b5381 [formerly f310e13350ba8e64e313d99a7d03d0ef3cdc6aba]]
Former-commit-id: 83ca3b5381
Former-commit-id: 73e48f7b1d
 2014-12-05 08:57:08 -06:00
Bryan Kowal
2d7a7eff76 Omaha #3508 - purge non-centralized yajsw distributions 
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: 0894efaaa3 [formerly 71cf313666 [formerly 9b36754ca610887a17666ceff2a1540b958913b6]]
Former-commit-id: 71cf313666
Former-commit-id: cf5353e368
 2014-12-04 17:33:43 -06:00
Bryan Kowal
d1ae8959d9 Omaha #3508 - created the yajsw rpm 
Former-commit-id: 127db6aaee [formerly 8be5362dbd [formerly 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21]]
Former-commit-id: 8be5362dbd
Former-commit-id: a89e9d96b9
 2014-12-04 16:26:55 -06:00
Fay.Liang
07316a588b Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: 19194e0aa3 [formerly 83a4987188 [formerly 1fcac564095b86cd4c6103a6484b25bbff2339b2]]
Former-commit-id: 83a4987188
Former-commit-id: f327b9dd5a
 2014-12-04 13:46:31 -05:00
Greg Armendariz
89f89f1abc Omaha #3216 - update postgres to use geos 3.4.2 
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 1b1064d541 [formerly 6dd90bb25a [formerly 453247c7731adb5e1ca4e58306d14715c0f3a350]]
Former-commit-id: 6dd90bb25a
Former-commit-id: 515aa32cc6
 2014-12-04 11:34:45 -06:00
Greg Armendariz
507fdb67f7 Omaha #3216 - Increment pypies release number 
Former-commit-id: 44af2c4ff1 [formerly 7ac9281ba6 [formerly 0497a64f539e716089736597385ff9ff3d18e5c0]]
Former-commit-id: 7ac9281ba6
Former-commit-id: 0650a941b1
 2014-12-02 14:45:04 -06:00
Bryan Kowal
d2c77a4f05 Omaha #3695 - PostgreSQL will always provide version 3.3.6 of geos. Version 3.3.6 
of geos is the only version that our current version of postgis will see. Even
when geos 3.3.7 and 3.3.6 are on the path during compilation, postgis will still
be compiled with a dynamic link to both versions of the library even though
there was not a 3.3.6 available during compilation.


Former-commit-id: 700eefe0ee [formerly eb52d1b333 [formerly 2dafcfc4e0350654c30eb077329711259bf12d1f]]
Former-commit-id: eb52d1b333
Former-commit-id: b1bf38f922
 2014-11-24 16:20:34 -06:00
Fay.Liang
e1e29a8283 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 5bd22b74c6 [formerly 99263f79e1 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]
Former-commit-id: 99263f79e1
Former-commit-id: 069db81e14
 2014-11-20 13:32:25 -05:00
Shawn Hooper
c3da295cf3 VLab Issue #5395 - Build fixes and gfeConfig.py update 
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: cf72b5753d [formerly b7369c5eef [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]
Former-commit-id: b7369c5eef
Former-commit-id: fd57e5334c
 2014-11-20 13:12:16 -05:00
Fay.Liang
2b49d6bc2d Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 45b80432d6 [formerly 29561d5324 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]
Former-commit-id: 29561d5324
Former-commit-id: a32ec39df2
 2014-11-19 22:07:54 -05:00
Shawn Hooper
8aff77b52b VLab Issue #5375 - Update spec file for VADATUMS tar file. 
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13

Former-commit-id: f88d320e60 [formerly 50cd8ace64 [formerly 83e81ee0af2d612f08f32e760e9f4d00ee1dd7aa]]
Former-commit-id: 50cd8ace64
Former-commit-id: 3455a07e99
 2014-11-19 14:08:27 -05:00
Greg Armendariz
397acc7119 Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b

Former-commit-id: d7af478037 [formerly ad5e3134e4 [formerly 0d4e39f166c8e8607d0a3c3f43f3656531e62e1e]]
Former-commit-id: ad5e3134e4
Former-commit-id: d3295027c2
 2014-11-18 13:48:19 -06:00
David Lovely
92f11c79c1 Omaha #2991 Fixed REST URL in Python scripts, Added checks to broker build commands to fail if they didnt work. 
Change-Id: I9bc88caa14d08861eb4dd4628b729bedc8500325

Former-commit-id: 3686a36ae7 [formerly e0525f7816 [formerly 89acb99f0639f34e4ba3530e49c81ce5dda42785]]
Former-commit-id: e0525f7816
Former-commit-id: 132ac21917
 2014-11-13 10:59:00 -06:00
David Lovely
dca2a23b04 Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30. 
Change-Id: Ib28bf8e2edb3b299a7122bac7c80f302780b7470

Former-commit-id: 1a191cac55 [formerly 625e83c445 [formerly 3addb3007b0bf7aab88b423bbf700583fc2b3e48]]
Former-commit-id: 625e83c445
Former-commit-id: b32d54c7f9
 2014-11-10 08:27:28 -06:00
Steve Harris
aca1f23f98 Merge tag 'OB_14.3.1-31m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: e770670ebf [formerly a5398d8035 [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]]
Former-commit-id: a5398d8035
Former-commit-id: 472d9bd206
 2014-11-04 13:17:44 -06:00
Shawn.Hooper
31c1d24165 ASM #16805 - Increment release number in the awips2-tools rpm spec file 
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 9332029a6d [formerly 285e4baaec [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]]
Former-commit-id: 285e4baaec
Former-commit-id: c715bdd83a
 2014-10-30 09:58:02 -04:00
Steve Harris
bf83d93e3f Merge tag 'OB_14.3.1-28m' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.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/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 19527f50bb [formerly 1b83d045ea [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]]
Former-commit-id: 1b83d045ea
Former-commit-id: 40225d128a
 2014-10-28 13:32:31 -05:00
David Lovely
58c9e93aba Omaha #2991 Initial add of qpid 0.28. Fixed an issue with the x86_64 directory not being created. 
Change-Id: Iacd5c7d8b41ab3100b7ea9c409ec18691ffe7fdc

Former-commit-id: 081ea4a12a [formerly 2f9c1e8303 [formerly b50c56c84968f4765245ec12fa33c3037b0380ff]]
Former-commit-id: 2f9c1e8303
Former-commit-id: 3d1fa8e1b8
 2014-10-23 15:55:26 -05:00
Shawn.Hooper
0a737d7605 ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf 
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868

Former-commit-id: 3b4b9d262a [formerly 0e372cd13e [formerly e29cf5a57591e5a25b6e73b267c0abb46e9f95c2]]
Former-commit-id: 0e372cd13e
Former-commit-id: 114ff128ed
 2014-10-22 14:47:42 -04:00
Steve Harris
f5b5d2bca2 Merge tag 'OB_14.3.1-27m' into omaha_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml

Former-commit-id: bfade7674d [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]
Former-commit-id: dc557b2d0c
Former-commit-id: e9c9a17f96
 2014-10-22 11:45:39 -05:00
Shawn.Hooper
9be238d949 ASM #16805 - Fix rpms/legal/ directory 
Change-Id: I369e4d5423c760bf689180239f15cfd363a202b3

Former-commit-id: a96693cb70 [formerly d0fba5965b [formerly 94872b496bec6c427030ea353856466809d2e6c1]]
Former-commit-id: d0fba5965b
Former-commit-id: 26054621ca
 2014-10-21 11:17:45 -04:00
Shawn.Hooper
3357578661 ASM #16805 - Update master rights and license files for 14.3.1. 
Change-Id: Ifb5b67010a01dfa9805e64d408f5688d10d7bf82

Former-commit-id: 65065f2380 [formerly e24cb3c37e [formerly f72ec046e98bdb6734dbce10ef472dd5294c59ba]]
Former-commit-id: e24cb3c37e
Former-commit-id: 217f39ee04
 2014-10-20 14:36:31 -04:00
Brian.Dyke
4cfcb51852 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 93df82ac92 [formerly 418894a17b [formerly f0f79fb324665245ef759947d24514a6c8bc4470]]
Former-commit-id: 418894a17b
Former-commit-id: 498abd3716
 2014-10-16 12:04:27 -04:00
Sean.Webb
eed9457e01 ASM #16827 - Added 6th channel configuration, and change logrotate to handle goes_add.log 
Change-Id: I2012ac01d51ed11c077d06b638ede4b990bce5cd

Former-commit-id: 5f6c9bc837 [formerly 36d39be5fd [formerly c11e78b57bca7d242d4d8c29dc51669d7aebb37d]]
Former-commit-id: 36d39be5fd
Former-commit-id: b256e04c45
 2014-10-16 10:38:14 -05:00
Ana Rivera
3b5fd4499b VLab Issue #5014; Workaround pqact pattern for ESTOFS (RM 295); fixes #5014 
Change-Id: I77529f91b0d6b59640bda21be909f84fdc049614

Former-commit-id: 927b2dea69 [formerly f516cc441d [formerly 721938a9fd9a270a2b886eb19de6df70fd62555d]]
Former-commit-id: f516cc441d
Former-commit-id: ee4cdc015f
 2014-10-15 18:41:58 +00:00
Steve Harris
fa1fa76dd9 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	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/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: da463c484e
Former-commit-id: f4b771ea72
 2014-10-03 10:18:34 -05:00
Ron Anderson
f97651285a Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm 
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]
Former-commit-id: ec1530c5e8
Former-commit-id: 35657166ea
 2014-09-30 14:09:31 -05:00
dmsys
70cb8d81b0 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
 2014-09-30 13:45:54 -04:00
Steve Harris
6900bb61c1 Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py

Former-commit-id: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
 2014-09-29 12:58:56 -05:00
Brian.Dyke
b89a2459ee Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4 
Former-commit-id: 0e0255ce5b [formerly 0c1b83b644 [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]
Former-commit-id: 0c1b83b644
Former-commit-id: 9661a1d7b1
 2014-09-29 11:55:16 -04:00
Ben Steffensmeier
a0d9cbede4 Omaha #3132 - merge master_14.3.1 into omaha_14.4.1 
Former-commit-id: 5b10ac2f36 [formerly f92d021e96 [formerly 00d314b6b493bc34ccd77f731307b5039e22d844]]
Former-commit-id: f92d021e96
Former-commit-id: 6090625040
 2014-09-29 10:49:14 -05:00
Brian.Dyke
fac7a6aaa1 Merge branch 'master_14.2.3' into master_14.2.4 
Former-commit-id: 46af1d0857 [formerly 0a497fc015 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]
Former-commit-id: 0a497fc015
Former-commit-id: fce029653d
 2014-09-29 11:20:57 -04:00
Sean.Webb
d3df1699db ASM #16720 - Added pushd and cd prior to patch extraction 
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225

Former-commit-id: 600b75bd9f [formerly 02e187a609 [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]
Former-commit-id: 02e187a609
Former-commit-id: 224cddfe9b
 2014-09-29 10:24:04 -04:00
Sean.Webb
86382f5396 ASM #16720 - Removed extraneous popd which was changing dir when not needed 
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683

Former-commit-id: 78f83fa594 [formerly 0738a41cbf [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]
Former-commit-id: 0738a41cbf
Former-commit-id: 6840d55343
 2014-09-29 08:21:00 -04:00
Sean.Webb
b186a8e714 ASM #16720 - Added updated palt.c to fix seq num in pqact pattern 
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5

Former-commit-id: 7d75d994c1 [formerly 628ab54d68 [formerly d59054c870fee17076aec22cd683ef1586a153da]]
Former-commit-id: 628ab54d68
Former-commit-id: eb959d100a
 2014-09-26 10:49:37 -04:00
Brian.Dyke
6dafb062e9 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	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
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 4b418918d4
Former-commit-id: b49b13f77e
 2014-09-24 11:05:37 -04:00
Sean.Webb
8c41cb256d ASM #16761 - Fixed typo on variable character 
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: a9dddb44ce [formerly 00479a436d [formerly 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36]]
Former-commit-id: 00479a436d
Former-commit-id: be3bb99abe
 2014-09-22 14:10:28 -04:00
Sean.Webb
c32fde89f9 ASM #16761 - Fixed typo on variable character 
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: 4c936b9bc8 [formerly 47aef24f6f [formerly 721bead655f9a384ea12444617774b7ef404feb0]]
Former-commit-id: 47aef24f6f
Former-commit-id: 07589bbdda
 2014-09-22 07:18:21 -04:00
Sean.Webb
e3ad9053d7 ASM #16761 - Fixed typo on variable character 
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: e0abd14986 [formerly 4368f4650b [formerly 5c541f50dcc68a856e8c81bff8577334abf1ff75]]
Former-commit-id: 4368f4650b
Former-commit-id: 502f7520a7
 2014-09-19 13:43:45 -04:00
Steve Harris
e3a7796362 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java

Former-commit-id: 4c56844e29 [formerly 091555cf10 [formerly 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce]]
Former-commit-id: 091555cf10
Former-commit-id: da530db540
 2014-09-19 10:28:57 -05:00
Sean.Webb
c061f7b1a0 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change 
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: 6ffb17540e [formerly b0b01694f7 [formerly 031c41d4f7801c8a5127cf007358856bf771593a]]
Former-commit-id: b0b01694f7
Former-commit-id: c90c45f303
 2014-09-19 09:29:31 -04:00
Sean.Webb
90fbb6bf28 ASM #16761 - Added retrans code updates from ISG 
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 51380a2363 [formerly 5c84cadaf6 [formerly 165b9a9b3481b3fa1d31b771eead03180430be59]]
Former-commit-id: 5c84cadaf6
Former-commit-id: 7f898635f9
 2014-09-19 07:25:18 -04:00
Sean.Webb
57553e3c5a ASM #16761 - Updated ldm spec to add retrans 
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: 4c36280560 [formerly 35bfd8269c [formerly bb9d431a842511b0081660224f3ddefd947f76fd]]
Former-commit-id: 35bfd8269c
Former-commit-id: b959842361
 2014-09-18 09:33:47 -04:00
Stephen Gilbert
aa11ac6e09 Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1 
Former-commit-id: 440bddda4b [formerly 5bf2ed644a [formerly 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3]]
Former-commit-id: 5bf2ed644a
Former-commit-id: e7d21b0293
 2014-09-15 13:20:34 -04:00
Sean.Webb
4b10cf2f9f ASM #16720 - Updated to ldm 6.12.6 
Change-Id: Ib005b9e9af0979d4aa1463e5555fd7b42c7fcc89

Former-commit-id: 5918cb05c1 [formerly c805e132bd [formerly f07bb36b5f5e01000345a37719e43cb2df4ea7d8]]
Former-commit-id: c805e132bd
Former-commit-id: 268db31231
 2014-09-11 15:13:58 -04:00