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

39 commits

Author SHA1 Message Date
Benjamin Phillippe
4e1d93abf8 Omaha #3379 Removing DWR 
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
 2014-07-11 11:56:44 -05:00
Steve Harris
e1c8ad2611 Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Former-commit-id: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
 2014-06-16 08:19:12 -05:00
Bryan Kowal
8896dc8a75 Omaha #3189 - ensure the PostgreSQL libpq libraries are included in the hydroapps native directory 
Former-commit-id: 1da5e7cb5f6d8a6b8e915a8ecb238a0825991afe
 2014-06-09 16:20:01 -05:00
Chip Gobs
036d1c4d31 VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. 
Change-Id: I096cc2e9c60a5aa26662e5fccc6692c3ce4f875d

Former-commit-id: 6944361d04e7462f768bb74f00780dc8b8a51225
 2014-06-05 13:37:02 -04:00
Steve Harris
455eb8b39d Merge branch 'omaha_14.3.1' (14.3.1-8) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
	edexOsgi/build.edex/edex/common.properties
	edexOsgi/build.edex/esb/conf/modes.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.whfs.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.whfs.so

Former-commit-id: 45250149681f057cf168f4d3cb27276279f62c05
 2014-06-02 11:21:46 -05:00
Brian.Dyke
3f1e12effc Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
 2014-05-30 10:46:25 -04:00
Bryan Kowal
c711ab9195 Omaha #3198 - update the Java used by hydro / mpe NativeLib to match the baseline AWIPS II version. 
Rebased on re-compiled on the latest version of the nativeLib code.


Former-commit-id: b96b174d5b4b082dc692e3a14ef1cc7b58f06b5a
 2014-05-27 13:16:37 -05:00
Steve Harris
b6af2db9f5 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: f8cb49d46f88b801a682a34a3b7056bde1ab2569
 2014-05-22 14:31:06 -05:00
Bryan Kowal
76cd1c2ac8 Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version. 
amend: remove debug code

Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3

Former-commit-id: 9ad4422eb9911f8fbf0c5db40103ee8a1d925570
 2014-05-20 11:02:31 -05:00
brian.dyke
58683ad040 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
 2014-05-19 09:45:37 -04:00
Mike Duff
6a67638a94 Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays 
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13

Former-commit-id: 57755db0d6d77f32d64b4b569bb0af88002a23da
 2014-05-08 14:36:54 -05:00
Chip Gobs
e42bef2a33 VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) ) 
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
 2014-05-06 10:48:35 -04:00
Loubna.Bousaidi
6d526cb1ff ASM #511 changes to transmit_rfc_bias calls from MPE 
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: a6033a982c80e822d9f4cb62a70b9722d79432c6
 2014-04-29 21:09:34 +00:00
Brian.Dyke
a0e7cb624a Fixed comment merge conflicts added .gitignore 
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
 2014-03-25 15:41:58 -04:00
Shawn.Hooper
85db05e819 ASM #377 - Baseline National River Location Database fails 
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
 2014-03-07 13:12:11 -05:00
David Gillingham
de12904c7a Issue #2783: Rewrite run_report_alarm script into EDEX service. 
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd
 2014-02-18 13:24:37 -06:00
Brian.Dyke
b23c6f59f7 Issue #179 
Former-commit-id: d8f5c94fdc7a3332293e24c5e59d1d7177a5fcd9
 2014-02-04 16:53:34 -05:00
Ron Anderson
62c445d872 Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.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.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 9f121ec921a2f8635c48f005ddb71787ad6bf166
 2014-01-13 17:45:20 -06:00
Steve Harris
d8e5799328 14.1.1-15 baseline 
Former-commit-id: cb8eca2a0dfc0e2348301e8d9932db824ecaf34c
 2014-01-06 14:08:08 -05:00
Steve Harris
b98eb9ffa4 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: 361e9942cf804578fb3e873229c1cd6fd6689fdf
 2013-12-02 16:17:38 -06:00
Steve Harris
71ae71c850 14.1.1-11 baseline 
Former-commit-id: c32b2b2037c84cc074e7dc5a5a13b93223640d7d
 2013-12-02 17:10:10 -05:00
Steve Harris
2f0d53c9b2 Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so (took master_14.1.1 version)

Former-commit-id: 5388a8206a9f447f2ff9030a9e6cfad76efc4cee
 2013-11-15 13:05:40 -06:00
Steve Harris
5a0a40e67c 14.1.1-9 baseline 
Former-commit-id: 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5
 2013-11-15 12:47:49 -05:00
Steve Harris
d8afc4c58c Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: 2d5b1f7563e0f8dbd0dadcfa89cad35ba6fac98b
 2013-11-06 13:22:12 -06:00
Steve Harris
6067af4252 14.1.1-6 baseline 
Former-commit-id: 7029e583ef36bf746fddda316ba011e27ed766b4
 2013-11-06 14:08:33 -05:00
Bryan Kowal
c76c856340 Merge branch 'master_14.1.1' into omaha_14.1.1 
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 412bcb0f21b7385a170d14b3a88dd67c91a301a2
 2013-10-31 15:23:08 -05:00
Steve Harris
99e3707c5b 14.1.1-4 baseline 
Former-commit-id: 0cda967cc9da9d2a08a0197db23d48c65f03be81
 2013-10-28 10:55:16 -04:00
Steve Harris
5739b4f832 14.1.1-3 baseline 
Former-commit-id: cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03
 2013-10-28 10:46:02 -04:00
Steve Harris
84ad96f2e0 Merge branch 'master_14.1.1' (13.5.2-7) into omaha_14.1.1 
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	rpms/python.site-packages/Installer.qpid/component.spec

kept the omaha_14.1.1 versions of the .so files


Former-commit-id: 5b5cb6d6fb5d492d9244e3fa50f84710a07811b3
 2013-10-01 15:34:01 -05:00
Steve Harris
3837fbe670 13.5.2-6 baseline 
Former-commit-id: 726299a49759971bf9a79ca7598c4f39ecb6721c
 2013-09-23 10:03:15 -04:00
Steve Harris
58c6821427 13.5.2-4 baseline 
Former-commit-id: da631849bc9eaaa5c83c2393520b6099413107a5
 2013-09-12 11:13:59 -04:00
Bryan Kowal
326cae8be4 Issue #2163 - RHEL6 nativeLib changes required for compiler compatibility 
- Amend: restore mpe changes
- Amend: attempt rebase

Change-Id: I7763e2b8b56cc9d2caae022f35e72c82a7f1da90

Conflicts:

	nativeLib/edex_com/.cproject
	nativeLib/edex_notify/.cproject


Former-commit-id: 5fb2f3ae5276385fb65c2102ad7619a855947632
 2013-09-04 10:08:21 -05:00
Bryan Kowal
8b51e353f1 Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6. 
Conflicts:
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so

Former-commit-id: 0a735f5fe81d5329bc02a421ecc39a0974d48d37
 2013-08-15 15:38:11 -05:00
Greg Armendariz
5577e686c1 13.5.1-13 baseline 
Former-commit-id: 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4
 2013-08-08 17:00:36 -04:00
Steve Harris
86ce1248c2 13.5.1-7 baseline 
Former-commit-id: 4310ff14ffe9c7975574bb8b40bef668a90649e4
 2013-07-18 12:07:22 -04:00
Steve Harris
e197f23ce3 13.5.1-4 baseline 
Former-commit-id: d18b403b332dff67d1c85d4317bbceda337d1b41
 2013-06-28 09:46:25 -04:00
Steve Harris
3386330894 13.5.1-2 baseline 
Former-commit-id: 36f4554f8f80812a5ffa0d243fe1a4ad6e330192
 2013-06-17 15:01:22 -04:00
Steve Harris
fe872355a7 13.5.1-1 baseline 
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
 2013-06-10 15:17:17 -04:00
Steve Harris
8347bed50e 13.4.1-7 baseline 
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
 2013-05-13 12:58:10 -04:00