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

874 commits

Author SHA1 Message Date
Shawn.Hooper
9c637bda0b ASM #15083 - Updates to allow nwps to be released in the gfesuite-server rpm 
Change-Id: I9ab3fca601120954ebe229d3a4f0871b7b43af28

Former-commit-id: 2c62f45654b0531349fef5e7523c67c94236ce1a
 2015-02-12 17:32:05 -05:00
Steve Harris
118f52263f Merge branch 'omaha_14.4.1' into omaha_15.1.1 
Former-commit-id: ffee274d844442a36d633deda5776c09a758cb38
 2015-02-12 12:48:29 -06:00
Ana Rivera
6191c93a9c 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: f6b3765fc1670db2b9ceef75be7422a07b2badcf
 2015-02-11 22:00:40 +00:00
Steve Harris
9311e6f440 Merge tag 'OB_14.4.1-10m' into omaha_14.4.1 
14.4.1-10


Former-commit-id: 4f95b3e9dc869b6398dc5891b3d4b0848c0731e2
 2015-02-11 15:53:38 -06:00
Steve Harris
a5da551a5d Omaha #4111 - Updated foss licenses and Master_Rights_File.pdf 
Former-commit-id: 45e09e8f848d85ae45205b655074bba8342c9156
 2015-02-11 10:58:07 -06:00
Fay.Liang
07076f91aa Merge branch 'master_14.3.1' into master_14.3.2 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 155801c3d418b6deb7e17ffb04c963a80d092c5a
 2015-02-10 10:59:16 -05:00
Ana Rivera
c2f02ff4b2 Merge branch 'omaha_14.4.1' into field_14.4.1 
Change-Id: I1d26e58a140111fb58ee67282fcb0a202ba65d8f

Former-commit-id: c6eb72ac05824e0eb7aad7c5ae1a7a0ee54e3265
 2015-02-10 14:41:19 +00:00
Fay.Liang
43c7161dcf 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: e91a78eec910b84f44350d3aae68a26f4e0dcd72
 2015-02-09 17:19:41 -05:00
Greg Armendariz
af72fd3775 Omaha #3299 - Fix collaboration RPM build issue 
Former-commit-id: 9132eff524289c5df48c682cd3ff226fe14cdf1b
 2015-02-06 11:37:47 -06:00
Joshua Watson
65a568b79d 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: 12e0aeea9fa6b2dc7de297aee0ff7d1de3a99111
 2015-02-05 09:26:20 -05:00
Shawn.Hooper
915ddd6964 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: f1383bbdbadc54f8f2a0384d319c70160464a3ac
 2015-02-04 16:47:26 -05:00
Greg Armendariz
bb8a61a996 Omaha #3839 - Add script to /awips2/edex/bin/ 
Former-commit-id: c215890342be6fed80d614e0a5853e8ce816a7f2
 2015-02-04 09:59:06 -06:00
Steve Harris
afb3d31759 Merge tag 'OB_14.4.1-6m' into omaha_15.1.1 
14.4.1-6

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 9fd5ed1aea1a667552144da88dcc394a99133c52
 2015-02-03 12:25:05 -06:00
Roger Ferrel
6e4b93ed15 Issue #4066 Added Earth Networks Total Lightning to pqact.template and RAW_DATA.xml 
Change-Id: I09ccfea7e02134339771550fb915bb3516067320

Former-commit-id: 4d9df40733b0ac8cfa40974dd13abe2e204ab3bd
 2015-02-03 11:58:13 -06:00
Greg Armendariz
e004e0881f Merge "Omaha #4065 - Update EDEX RPM install to modify date stamp" into omaha_14.4.1 
Former-commit-id: ddf9b7d0a97ffda6e79688d7c35c828fb7fc1d91
 2015-02-03 11:35:26 -06:00
Greg Armendariz
fbadd1deb1 Omaha #4065 - Update EDEX RPM install to modify date stamp 
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0

Former-commit-id: 83243af002e8ddfd15f899ff1ab3e511cf5a0af4
 2015-02-03 10:12:54 -06:00
David Lovely
b8a10c4336 Omaha #3945 Moved the ESB folder to deploy.edex.awips2 and updated the build scripts. 
Former-commit-id: b9868fc974226fe6b003b0361ce1b18507b2d810
 2015-01-28 15:15:15 -06:00
Ana Rivera
20ad0a65f3 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: 291d66c66af4f1f4d298185412d5930714ffb2c5
 2015-01-27 22:05:59 +00:00
Steve Harris
8eb10d0456 Merge tag 'OB_14.4.1-4m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
	edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java

Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
 2015-01-27 11:56:24 -06:00
Ana Rivera
327945af8b 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: 889608360567b829f81ed6392c64c669798f34a9
 2015-01-27 16:28:42 +00:00
Greg Armendariz
0ebaf6c5eb Omaha #3777 - Update numpy 
Former-commit-id: cb63272b0eab1ea78230326da1733b0d55e3da9a
 2015-01-26 09:54:56 -06:00
Steve Harris
9234ceb485 Merge tag 'OB_14.4.1-2m' into omaha_15.1.1 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)

Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
 2015-01-23 09:32:44 -06:00
Steve Harris
0f05c53a53 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: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
 2015-01-23 09:08:06 -06:00
David Gillingham
86465c82dd Omaha #4014: Add pattern for ETSS to pqact.conf. 
Change-Id: I016cc2c4cfdae309a8129876c519ca7919eafe5e

Former-commit-id: d9ed1da11db7de1d662e0ed2b700ba4a2d8e868d
 2015-01-21 10:29:30 -06:00
David Lovely
cf4077e8cd Omaha #3957 Removed trailing slash in Spec for QPID. 
Change-Id: Ief731b9e13701c19cd11bc383b1336e53d6174f5

Former-commit-id: 5fe598aef48f91e57d8f233872ccd0bab395164e
 2015-01-15 08:16:18 -06:00
David Lovely
0b7ee2dc08 Omaha #3957 Fixed path in Installer.edex-environment for QPID. 
Change-Id: I846d0793c646a2e6321ed74ab672f70407ff13ac

Former-commit-id: 8107830bf2fa384c3bbe9472801c89a2a43990a3
 2015-01-14 14:40:36 -06:00
David Lovely
f75230366c Omaha #3957 Fixed path in Installer.edex-environment for QPID. 
Change-Id: I22eea04180974e6d3cbcfb4fc4a2e18fe7823db9

Former-commit-id: 34faf643b5de3c01713e0129209efb4ccc2c2aa0
 2015-01-14 11:28:56 -06:00
Fay.Liang
eed6737801 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: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
 2015-01-12 13:03:31 -05:00
David Lovely
e56002debf Omaha #3957 Moved QPID to build repository directory structure. 
Change-Id: Idee474cb4dd3d9366acfad941bedcf3c999be084

Former-commit-id: f27b0c6b92b4c744493e44b510defe3d650ca1f6
 2015-01-07 12:03:10 -06:00
Fay.Liang
77863309a9 Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
 2014-12-22 14:43:32 -05:00
Qinglu.Lin
baa96590f1 ASM #637 - Create a base level map bundle for the WarnGenLoc shape file 
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25

Former-commit-id: 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864
 2014-12-17 16:53:31 -05:00
Brian Clements
6ae64007a2 Issue #3935 prevent warning when using init.d script to stop edex 
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: b1034aa16b3393e6584038ebb80faf2a4e1a831f
 2014-12-17 14:35:16 -06:00
Joshua Watson
5aa4748569 VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238 
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667

Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
 2014-12-17 08:38:27 -05:00
Ana Rivera
1823ed3596 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: 111ae763e6becb944e34e262e1d87d2d344236e4
 2014-12-16 23:39:02 +00:00
Richard Peter
8de1ebcb65 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: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
 2014-12-12 10:36:04 -06:00
Joshua Watson
bca4b40eed VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129 
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840

Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
 2014-12-11 11:39:00 -05:00
Bryan Kowal
0b65eb314d Omaha #3914 - increment yajsw release 
Former-commit-id: 9a3e3a2cfdc29926e2d08c7a8e33d45f9ce5f22a
 2014-12-10 10:34:26 -06:00
Brian Graham
e1b4c4abe3 ASM #15662 - Updated spec files to include AWIPS version 
Change-Id: If8f78761550355a1ec55b6abde594583821d4d9f

Former-commit-id: 11741b03db9424aa10086553729303fa23a7366f
 2014-12-09 09:25:59 -05:00
Bryan Kowal
9e77b9635e Omaha #3508 - remove references to yajsw in %files 
Former-commit-id: 471f14a73ca4e6575e5a2316ac17cddc5ca42bb9
 2014-12-05 10:04:42 -06:00
Bryan Kowal
48ec32e595 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm. 
Former-commit-id: f6a3317e329728080f8efe8db545e3324161986e
 2014-12-05 09:20:23 -06:00
Greg Armendariz
610f38e9ef Merge "Omaha #3508 - purge non-centralized yajsw distributions" into omaha_14.4.1 
Former-commit-id: 58b7cbad88b75985e8a0d6bd4c2db72b5ce28d23
 2014-12-05 08:57:37 -06:00
Greg Armendariz
ed42ecc0e8 Merge "Omaha #3508 - created the yajsw rpm" into omaha_14.4.1 
Former-commit-id: f310e13350ba8e64e313d99a7d03d0ef3cdc6aba
 2014-12-05 08:57:08 -06:00
Bryan Kowal
0894efaaa3 Omaha #3508 - purge non-centralized yajsw distributions 
amend: ensure edex is dependent on yajsw

Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55

Former-commit-id: 9b36754ca610887a17666ceff2a1540b958913b6
 2014-12-04 17:33:43 -06:00
Bryan Kowal
127db6aaee Omaha #3508 - created the yajsw rpm 
Former-commit-id: 6bd0c60b4c5ba3ff6b424cac04c42728594b4c21
 2014-12-04 16:26:55 -06:00
Shawn.Hooper
e4224cd67b ASM #16805 - Update component.spec for awips2-java for removal of license.txt file 
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: dc77d48fc9c9e5183b94bc05321ab0061404a4ff
 2014-12-04 16:48:33 -05:00
Fay.Liang
19194e0aa3 Merge branch 'master_14.3.1' into master_14.3.2 
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
 2014-12-04 13:46:31 -05:00
Greg Armendariz
1b1064d541 Omaha #3216 - update postgres to use geos 3.4.2 
Change-Id: If1b56c95e32cbbe4c78c8dfb956fdff8ecb8aa2b

Former-commit-id: 453247c7731adb5e1ca4e58306d14715c0f3a350
 2014-12-04 11:34:45 -06:00
Greg Armendariz
44af2c4ff1 Omaha #3216 - Increment pypies release number 
Former-commit-id: 0497a64f539e716089736597385ff9ff3d18e5c0
 2014-12-02 14:45:04 -06:00
Bryan Kowal
700eefe0ee 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: 2dafcfc4e0350654c30eb077329711259bf12d1f
 2014-11-24 16:20:34 -06:00
Fay.Liang
5bd22b74c6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2 
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
 2014-11-20 13:32:25 -05:00