Ana Rivera
d8b54a59cf
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: 420132b3966191c93a9c
2015-02-11 22:00:40 +00:00
Ana Rivera
0bab05a20b
Merge branch 'omaha_14.4.1' into field_14.4.1
...
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f
Former-commit-id: bdb0e3aacbc2f02ff4b2
2015-02-10 14:41:19 +00:00
Fay.Liang
0b98fc8be6
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 59f3f8719043c7161dcf
2015-02-09 17:19:41 -05:00
Greg Armendariz
483ed63a57
Omaha #3299 - Fix collaboration RPM build issue
...
Former-commit-id: b88c8da164af72fd3775
2015-02-06 11:37:47 -06:00
Joshua Watson
ac46876161
VLab Issue #5238 - serverConfig.py - changed parmsGFSLAMPGrid to GFSLAMPGridPARMS, changed serverConfig.Vis to Vis on that same line. pqact.conf.template - fixed typo on line 223 FLE to FILE, line 286 missing a period in pattern; fixes #5238
...
Change-Id: Ia83e3576613683fa58a7631150d2d3132937a7b4
Former-commit-id: aec617b1eb65a568b79d
2015-02-05 09:26:20 -05:00
Shawn.Hooper
ebe39a11ae
ASM #15311 - Update pgadmin spec file to allow for postgresql version greater than or equal to 8.4.13-1 and customTargets.xml for EDEX to allow for flexible feature files.
...
Change-Id: I9cf47aff9c6fa874ffe3d2e8bbbba2871abacec2
Former-commit-id: a98b54a944915ddd6964
2015-02-04 16:47:26 -05:00
Greg Armendariz
d405e4bfe1
Omaha #3839 - Add script to /awips2/edex/bin/
...
Former-commit-id: 25cb96ec19bb8a61a996
2015-02-04 09:59:06 -06:00
Greg Armendariz
48afd5b062
Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1
...
Former-commit-id: e87f8c0c5fe004e0881f
2015-02-03 11:35:26 -06:00
Greg Armendariz
a3d4342498
Omaha #4065 - Update EDEX RPM install to modify date stamp
...
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 8c38289cf7fbadd1deb1
2015-02-03 10:12:54 -06:00
Ana Rivera
3696a3a1d1
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 8bfa7c408720ad0a65f3
2015-01-27 22:05:59 +00:00
Ana Rivera
5e97e24201
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 7c5fc26537327945af8b
2015-01-27 16:28:42 +00:00
Steve Harris
033d0fc742
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 158fa163760f05c53a53
2015-01-23 09:08:06 -06:00
David Lovely
f7565da27d
Omaha #3957 Removed trailing slash in Spec for QPID.
...
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5
Former-commit-id: 1cfc27241fcf4077e8cd
2015-01-15 08:16:18 -06:00
David Lovely
f75e17f79e
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac
Former-commit-id: 63c36315590b7ee2dc08
2015-01-14 14:40:36 -06:00
David Lovely
5bbea995ae
Omaha #3957 Fixed path in Installer.edex-environment for QPID.
...
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9
Former-commit-id: 9b9d569062f75230366c
2015-01-14 11:28:56 -06:00
Fay.Liang
5cc8e5b4af
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: c6bd5d7675eed6737801
2015-01-12 13:03:31 -05:00
David Lovely
d860af2218
Omaha #3957 Moved QPID to build repository directory structure.
...
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084
Former-commit-id: 240927c241e56002debf
2015-01-07 12:03:10 -06:00
Fay.Liang
22fc1baada
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 06061eee1977863309a9
2014-12-22 14:43:32 -05:00
Qinglu.Lin
cae57983d8
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 3b3780fd13baa96590f1
2014-12-17 16:53:31 -05:00
Brian Clements
53f28e0b75
Issue #3935 prevent warning when using init.d script to stop edex
...
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: d2774cffc26ae64007a2
2014-12-17 14:35:16 -06:00
Joshua Watson
094e8048e9
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 3f2f7f2f3a5aa4748569
2014-12-17 08:38:27 -05:00
Ana Rivera
d2d8127363
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 043bc3a8b71823ed3596
2014-12-16 23:39:02 +00:00
Richard Peter
f7d8755ba9
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: 2457d0e6f78de1ebcb65
2014-12-12 10:36:04 -06:00
Joshua Watson
9383635749
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
...
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: a8f5bb480bbca4b40eed
2014-12-11 11:39:00 -05:00
Bryan Kowal
9efc72561b
Omaha #3914 - increment yajsw release
...
Former-commit-id: aad5e554b90b65eb314d
2014-12-10 10:34:26 -06:00
Brian Graham
24ca442651
ASM #15662 - Updated spec files to include AWIPS version
...
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f
Former-commit-id: 99143e0045e1b4c4abe3
2014-12-09 09:25:59 -05:00
Bryan Kowal
7575599185
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 9e55db1c529e77b9635e
2014-12-05 10:04:42 -06:00
Bryan Kowal
9f5297504d
Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
...
Former-commit-id: 19f6551c8848ec32e595
2014-12-05 09:20:23 -06:00
Greg Armendariz
f307a34150
Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1
...
Former-commit-id: 8803a6b658610f38e9ef
2014-12-05 08:57:37 -06:00
Greg Armendariz
9883443470
Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1
...
Former-commit-id: 83ca3b5381ed42ecc0e8
2014-12-05 08:57:08 -06:00
Bryan Kowal
ccb7cead64
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 71cf3136660894efaaa3
2014-12-04 17:33:43 -06:00
Bryan Kowal
c3bb142d88
Omaha #3508 - created the yajsw rpm
...
Former-commit-id: 8be5362dbd127db6aaee
2014-12-04 16:26:55 -06:00
Shawn.Hooper
c24d9b2f90
ASM #16805 - Update component.spec for awips2-java for removal of license.txt file
...
Change-Id: I55524734785e63647cba46edb8e15324b794af95
Former-commit-id: d3f6005946e4224cd67b
2014-12-04 16:48:33 -05:00
Fay.Liang
19d1be03e0
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 83a498718819194e0aa3
2014-12-04 13:46:31 -05:00
Greg Armendariz
aba34ca613
Omaha #3216 - update postgres to use geos 3.4.2
...
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b
Former-commit-id: 6dd90bb25a1b1064d541
2014-12-04 11:34:45 -06:00
Greg Armendariz
bed2187d35
Omaha #3216 - Increment pypies release number
...
Former-commit-id: 7ac9281ba644af2c4ff1
2014-12-02 14:45:04 -06:00
Bryan Kowal
d40302bf3b
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: eb52d1b333700eefe0ee
2014-11-24 16:20:34 -06:00
Fay.Liang
7aa08b8ba4
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 99263f79e15bd22b74c6
2014-11-20 13:32:25 -05:00
Shawn Hooper
330eae9f9e
VLab Issue #5395 - Build fixes and gfeConfig.py update
...
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1
Former-commit-id: b7369c5eefcf72b5753d
2014-11-20 13:12:16 -05:00
Fay.Liang
de4ab82df7
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 29561d532445b80432d6
2014-11-19 22:07:54 -05:00
Shawn Hooper
58fed17369
VLab Issue #5375 - Update spec file for VADATUMS tar file.
...
Change-Id: Id4cb17192ca46af4dc731ebae260c9a8a3acfd13
Former-commit-id: 50cd8ace64f88d320e60
2014-11-19 14:08:27 -05:00
Greg Armendariz
756d33bf89
Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build
...
Change-Id: Iedaba76caf3b690d31012dff00f91f3cd5e81e8b
Former-commit-id: ad5e3134e4d7af478037
2014-11-18 13:48:19 -06:00
David Lovely
66e3669532
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: e0525f78163686a36ae7
2014-11-13 10:59:00 -06:00
David Lovely
b9451471ac
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: 625e83c4451a191cac55
2014-11-10 08:27:28 -06:00
Steve Harris
42db241877
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: a5398d8035e770670ebf
2014-11-04 13:17:44 -06:00
Shawn.Hooper
0b0b922968
ASM #16805 - Increment release number in the awips2-tools rpm spec file
...
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4
Former-commit-id: 285e4baaec9332029a6d
2014-10-30 09:58:02 -04:00
Steve Harris
bd4b324ebe
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: 1b83d045ea19527f50bb
2014-10-28 13:32:31 -05:00
David Lovely
2f02a475a8
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: 2f9c1e8303081ea4a12a
2014-10-23 15:55:26 -05:00
Shawn.Hooper
d62f27cae6
ASM #16805 - Removed references to obsolete license.txt file and renamed Master_Rights_file.pdf
...
Change-Id: I2b3a021440c834df3505ed11a2883f0fb214a868
Former-commit-id: 0e372cd13e3b4b9d262a
2014-10-22 14:47:42 -04:00
Steve Harris
9e7ce04543
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: dc557b2d0cbfade7674d
2014-10-22 11:45:39 -05:00
