Commit graph

22 commits

Author SHA1 Message Date
Richard Peter
6502f1f695 Merge branch 'omaha_14.1.1' (14.1.1-8) into development_on_RHEL6
Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DatabaseArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/DefaultPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IDataArchiver.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiveFileNameFormatter.java
	edexOsgi/com.raytheon.uf.edex.archive/src/com/raytheon/uf/edex/archive/IPluginArchiver.java
	nativeLib/rary.meteorological/src/solax.f

Change-Id: I188bbccdb3c6f4036577aa90074a990e2832b822

Former-commit-id: 0074b774f0 [formerly 79bdd34f4f [formerly f7f30006cdaf3c8e99d166463c226b504f458b83]]
Former-commit-id: 79bdd34f4f
Former-commit-id: 2c753c427c
2013-11-14 14:40:23 -06:00
Bryan Kowal
8afbe25d22 Issue #2547 - fix RHEL6 nativeLib build in 14.1.1
Former-commit-id: e3639da703 [formerly a51231058a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]]
Former-commit-id: a51231058a
Former-commit-id: b2272ad695
2013-11-12 19:57:25 -06:00
Bryan Kowal
5164a7c0b1 Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: feaacd9356
Former-commit-id: 38464427d3
2013-10-31 15:34:46 -05:00
Bryan Kowal
2ebed2011f 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: c76c856340 [formerly 665911b033 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: 665911b033
Former-commit-id: 4d7a4aefec
2013-10-31 15:23:08 -05:00
Steve Harris
cb3b53f205 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
2013-10-28 10:55:16 -04:00
Steve Harris
a0ba2e1252 14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
2013-10-28 10:46:02 -04:00
Bryan Kowal
a564f382da Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 9a472e1bbe [formerly b7b11dc747 [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]
Former-commit-id: b7b11dc747
Former-commit-id: 2ad7db4f5d
2013-10-16 12:54:58 -05:00
Bryan Kowal
92aedd9726 Issue #2422 - recompile updated grib2.so for RHEL6
Former-commit-id: bb9b1e4279 [formerly 9c3c123631 [formerly ae2923791512c7488805c19a773390ef1de5150b]]
Former-commit-id: 9c3c123631
Former-commit-id: 585f63e88c
2013-10-09 18:38:58 -05:00
Bryan Kowal
740c53e49e Merge branch 'development' into development_on_RHEL6
Conflicts:
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 2b26c4c242 [formerly 37d1dd492b [formerly 2e6b76af19b308392e90dfee4c950200ec5c2560]]
Former-commit-id: 37d1dd492b
Former-commit-id: 82559064ef
2013-10-09 17:07:10 -05:00
Ben Steffensmeier
d9f383217f Issue #2402 Modify grib decoder to work on file extents.
Change-Id: I61ffe0a038b5c4f80c78e00fde652a9c87ca96b9

Former-commit-id: 2b089b0848 [formerly 7d2b48de48 [formerly 1525772d1b42348f0eca78fc966d2c7878496ea7]]
Former-commit-id: 7d2b48de48
Former-commit-id: c896c9bf30
2013-10-09 12:50:02 -05:00
Bryan Kowal
3b7573154c Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/build/p2-build.xml
	edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
	edexOsgi/meteolib.jni.linux64/libmeteoLib.so
	javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.meteorological/.cproject
	nativeLib/rary.meteorological/src/dcapeFunc.c
	rpms/awips2.cave/Installer.cave-etc/component.spec
	rpms/awips2.cave/Installer.cave-feature/component.spec
	rpms/awips2.core/Installer.aviation/component.spec
	rpms/awips2.qpid/0.18/deploy.builder/build.sh
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]
Former-commit-id: c125b5b053
Former-commit-id: bb5acf7c11
2013-09-30 18:00:31 -05:00
Bryan Kowal
3794ade854 Issue #2334 - only free memory when we actually no longer care about its contents.
Change-Id: I49fc1e514c65065ddb6e834a6aeed41f466341f4

Former-commit-id: 706920aed6 [formerly 5e334a7b0e [formerly ac3d847501e41668f923f2ea40572c3894e8dc79]]
Former-commit-id: 5e334a7b0e
Former-commit-id: 0d9fe24f7b
2013-09-19 17:32:08 -05:00
Bryan Kowal
5b9b97b080 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: 326cae8be4 [formerly 9db548db3e [formerly 5fb2f3ae5276385fb65c2102ad7619a855947632]]
Former-commit-id: 9db548db3e
Former-commit-id: 5bcf751c50
2013-09-04 10:08:21 -05:00
Bryan Kowal
c7ca10997a Issue #2215 - Updates to edex_com and edex_notify for the thrift 0.9.0 upgrade.
- Amend: fix data types in GridDataRequestMessage

Change-Id: I7f7abd36b3c3f94c24ee0381115c5643aae39f22

Former-commit-id: a44a5d16e7 [formerly c5c9f4d30b [formerly e317a0d7101182ad351f604cfc04ad0292773161]]
Former-commit-id: c5c9f4d30b
Former-commit-id: 8ac250ca02
2013-07-29 13:50:33 -05:00
Steve Harris
2487a8b435 13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
2013-06-28 09:46:25 -04:00
Bryan Kowal
0d2958f693 Issue #2021 - dist.native make update target will now deploy to files.native directory structure instead of producing a tar file.
Change-Id: Ie625a515e8dc30cacc002bb6d8e77365c1347a13

Former-commit-id: 33a5b6d42d [formerly 71b04e3147 [formerly 02af194872173d89f77e15a6a8caca1e5812dbe4]]
Former-commit-id: 71b04e3147
Former-commit-id: bc1ef2c5fe
2013-06-04 12:52:27 -05:00
Steve Harris
1b8e623c9b 13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
2013-04-01 12:04:56 -05:00
Ben Steffensmeier
6756174e95 Issue #1821 Make grib2 decoding more multithreaded
Former-commit-id: cf7d8378dd [formerly f824e298b6 [formerly 4441b32d3ec153a2cf767b8e109c014f9efc3ed8]]
Former-commit-id: f824e298b6
Former-commit-id: 842ee7a78f
2013-03-25 14:48:42 -05:00
Steve Harris
0d8d18d7e2 12.10.1-4 baseline
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
2012-09-13 12:08:11 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00