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

243 commits

Author SHA1 Message Date
Nate Jensen
cc092f365a Omaha #4259 merging most of the rest of JEP updates with our changes 
Change-Id: I3d530e5ebf17d63d2bb61a2b8bfb818eaa2f80cb

Former-commit-id: 4ad70d2021420bff9b5060068c9f682b01c04757
 2015-04-09 18:08:34 -05:00
Fay.Liang
7349df3d27 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
 2015-04-08 12:22:27 -04:00
Nate Jensen
eb8d673675 Omaha #4259 non-hacky support for accessing inner classes 
Change-Id: I5058ef5b5cda7bc59e1f50786ee277ae0637d9a1

Former-commit-id: 07886e9e1a91fb79d560d8f6f3c5224aab156968
 2015-04-07 09:30:48 -05:00
Nate Jensen
418d41e200 Merge "Omaha #4259 fix when java method expects string arg and gets java.lang.String instead of Py_String" into omaha_16.1.1 
Former-commit-id: 842dfb0fa6e7a3cda122f14148a18b5cb83b5eee
 2015-04-01 21:34:47 -05:00
Steve Harris
f7af8ee606 Merge branch 'omaha_15.1.1' into omaha_16.1.1 
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
 2015-04-01 17:22:45 -05:00
Fay.Liang
499a7c7e80 ASM #17024 - Check-in library.ohd.pproc.so after merge/build from 14.4.1-21 to 15.1.1 
Former-commit-id: ef3c93c82e72b9c574c2bbba8536e568e2a078ac
 2015-04-01 14:56:17 -04:00
Nate Jensen
487b1ff68a Omaha #4259 fix when java method expects string arg and gets java.lang.String 
instead of Py_String

Change-Id: Ic65c49fcf3b9ef051b0c36d12b00e02183eeba2f

Former-commit-id: 452379894eec349ba6d1b901073b1f2746c08e94
 2015-04-01 12:09:15 -05:00
Fay.Liang
a204a6210e Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
 2015-04-01 13:04:48 -04:00
Shawn.Hooper
714044cb9b ASM #14920 - Revert "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly" 
This reverts commit 3c532660b0 [formerly 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1].
There were nativeLib files inadvertently committed to this DR.
They will be reverted and only the correct file will be committed.

Change-Id: I72750a5cc4a47603396cf89cd822d7cb0c53f55b

Former-commit-id: aed96fb67913e5a300f5b201838ac3dd96d5f72b
 2015-04-01 12:39:52 -04:00
Nate Jensen
4d59a38a3d Omaha #4259 fix pyjlist slice assignment 
Change-Id: Ida83669d57ee2f135d125071a57e3c5b004e31b1

Former-commit-id: e350bd0098041ef73ea0d9d2db0e1d39e3d24eb5
 2015-04-01 10:53:58 -05:00
Nate Jensen
99b5d09d9d Omaha #4259 native java.util.List support in JEP 
Change-Id: If0706318fd409884933433a8edf279e1f6659621

Former-commit-id: 4921ee47a87af497fdc2be53f6bde67b857587b8
 2015-03-31 10:44:18 -05:00
Fay.Liang
133a603566 Merge tag 'OB_14.4.1-20m' into master_15.1.1 
14.4.1-20m

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
 2015-03-30 14:28:30 -04:00
Steve Harris
7375074ed8 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1 
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
 2015-03-30 11:07:52 -05:00
Nate Jensen
64a82afdc9 Merge "Omaha #4259 clean up pyjclass optimization for inclusion in jep" into omaha_16.1.1 
Former-commit-id: 5d1b229924399e16617347162e97e3210608a8f8
 2015-03-23 17:28:11 -05:00
Nate Jensen
1d87ce6e8b Omaha #4259 clean up pyjclass optimization for inclusion in jep 
Change-Id: I2f887276fcdaeb57b8c0193bcc92397328400954

Former-commit-id: aac3401e112bf8f7d85dc3a08788fc6a30afc91a
 2015-03-23 15:12:01 -05:00
Nate Jensen
7c9754df2d Omaha #4259 remove mistakes from 2009 
Change-Id: I5d52789d72f0ed0a6fb46c9d1012615f34d39963

Former-commit-id: 55d47895ae2bb64601178b1aceabdbf2a655fb94
 2015-03-23 15:10:08 -05:00
Fay.Liang
3546b8901d Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1 
Former-commit-id: 366cd07d35f6e9f842ba72d1164a53fbb5fc6838
 2015-03-19 12:42:35 -04:00
Fay.Liang
86a8041062 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/build.edex/edex/common.properties

Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
 2015-03-19 12:35:31 -04:00
Steve Harris
c585001981 Merge branch 'omaha_15.1.1' into omaha_16.1.1 
Former-commit-id: 3e863af798cf64ae9bbde71649339aa99698e33b
 2015-03-18 16:05:13 -05:00
Steve Harris
67b3a77c4f Merge tag 'OB_14.4.1-18m' into omaha_15.1.1 
14.4.1_18m

 Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
 2015-03-18 09:29:01 -05:00
Steve Harris
169b925507 Merge branch 'omaha_15.1.1' into omaha_16.1.1 
Former-commit-id: 04fa26ff310af7fd9574eeae98900d83e18ba276
 2015-03-18 08:50:05 -05:00
Nate Jensen
ffd2ca584e Omaha #4259 improve jep exception handling to properly include CausedBys 
when jep encounters java exceptions and include python stack as part of
the stacktrace so only the exception message is shown to users

Change-Id: Ic62c2c2a8f4b54a95cbac526f118e5b43702db70

Former-commit-id: 9c72a28d06a8d2d6bd052e0858568b65ed1cb14a
 2015-03-16 20:25:23 -05:00
Nate Jensen
e1536e8a6e Omaha #4234 initialize the main python interpreter on a different thread 
than the sub-interpreters, or warn when that happens

Change-Id: Id4d2c2401c96f6d884e5c468419f2d5893f6eafd

Former-commit-id: 5386e7fabcfbac366bb5335f601bcd0719b4f32c
 2015-03-10 15:41:32 -05:00
Matthew Howard
6bbcf0f6d0 Merge "ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly" into asm_15.1.1 
Former-commit-id: 1d32e7e33c5d6fed4bc3c393cc25b31e528ba6a7
 2015-03-10 11:26:52 -05:00
Chip Gobs
872547c9f5 VLab Issue #6752 - MPE DR 9561: Update purge_mpe_files - CHPS support ;fixes #6752 
Former-commit-id: fb950b47809a2c9d03a55ccfc24cd7d41560172b
 2015-03-10 10:05:43 -04:00
Fay.Liang
0e475cb704 Merge tag 'OB_14.3.2-19m' into master_14.4.1 
14.3.2-19m

Conflicts:
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/InitPrecipClimo.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MeanMonthlyPrecip.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.edex.uengine/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.edex.uengine/src/gov/noaa/nws/ncep/edex/uengine/tasks/profile/MdlSoundingQuery.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpTimeStnPaneResource.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 4b3626307cf35ada45985c25cf062e7b857db764
 2015-03-09 16:11:13 -04:00
Bruce.Hundermark
3c532660b0 ASM #14920 - GFE: Smartinits not calculating 12hr PoP correctly 
Change-Id: Ic8f63277a4b322e4908bbfe6fd32c28ffd3b1d24

Former-commit-id: 5c2d02a67bd5b4594c6d90afcbae4e8159e0edd1
 2015-03-09 19:14:36 +00:00
Bruce.Hundermark
fe162829de ASM #13961 - GFE: ISC_Discrepancies tool creates unnecessary alarms 
Change-Id: I7d4aec9d82a6f792bdf2a20d2b3fd271829d1edb

Former-commit-id: 19bd1d7d169521f322fbfb828ee27327515e0152
 2015-03-02 18:22:55 +00:00
Fay.Liang
66dd6987a1 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: c1bcd2a0db42c30d447a54ed185fc33d875628b3
 2015-02-24 14:58:28 -05:00
Jingtao Deng
5756c660b4 VLab Issue #6488 - DR17123 Hydro HPE bias_source field in HPERadarResult table needs NO BIAS for some products; fixes #6488 
Change-Id: I8c33b5e39222c13d2d3c1143d17ba77a06f6f877

Former-commit-id: d8f55d811a11bdb76f69dc7a5ee7cd656c8e63fe
 2015-02-18 13:53:36 -05:00
Shawn.Hooper
3c3b69809d ASM #14246 - Check-in updated transmit_rfc_qpe script 
Change-Id: I26751d39d2b31a345276da722c7a25a9ff8f9508

Former-commit-id: 72dd2f411e10e1eb6a934adf05d7df179b570ded
 2015-02-11 13:55:20 -05:00
Shawn.Hooper
ca8b043aed ASM #16804 - Check in the required library files 
Change-Id: Ib84d554ef4723072f8272327b7d00a737ba1405a

Former-commit-id: 22fc7ef208aaef87d2ef366f9ae8c0840379139c
 2015-02-11 12:40:33 -05:00
Fay.Liang
326ded8d5d Merge branch 'ohd_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveBestEstimate.java

Former-commit-id: 2b65d7a2e76d9d07f10fd6068e7c83b2a0b63975
 2015-02-04 21:35:40 -05:00
Shawn.Hooper
da357f98ee ASM #17069 - Checkin rebuilt library.ohd.pproc.so 
Change-Id: Iacff8a6237f75a5d98fbd1b5c8a6f606b4be04de

Former-commit-id: 73e910edadfc33b19701ae5e80089e6ac7acf6cb
 2015-02-04 21:12:44 -05:00
Chip Gobs
ca7afdcf6c VLab Issue #6313 - RM 17069 - MPE mpe_generate_list token length too short; fixes #6313 
Change-Id: I198f6016f10cdaf6c105c89bd7a4c9e445b9a98b

Former-commit-id: 919269c680602c639de54811dd1a65d4aa67fdad
 2015-02-04 20:24:24 +00:00
Shawn.Hooper
00d89c9b8d ASM #16969 - Update jdk tarball with correct version 
Change-Id: I1a6a445159f39168dc070783548d443a82225bd3

Former-commit-id: 623724f2920280470ef0f60ff4c263754917591e
 2015-01-29 14:23:23 -05:00
Shawn.Hooper
a757b55446 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
 2015-01-22 16:05:41 -05: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
steve.naples
bdbdc68b2a ASM #16969 - NativeLib: Update 32bit versions of Java and Postgresql to latest versions. 
Change-Id: I23a4dae2aef9bdf71848c1e9a3338e1bddc39205

Former-commit-id: 28f92f6b49d286f7c470bda6184d12b7882bb768
 2015-01-06 19:49:03 +00:00
Chip Gobs
d6619ab0e0 VLab Issue #5615 MPE:Null DAA Radar Product Handling; fixes #5615 
Former-commit-id: ef877ed41166503b844c81ac7e3108421ff872ec
 2014-12-12 13:12:48 -05:00
David Lovely
1a191cac55 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: 3addb3007b0bf7aab88b423bbf700583fc2b3e48
 2014-11-10 08:27:28 -06:00
Nate Jensen
b23d42f561 Omaha #3676 harden numpy array to java array conversions to work with 
newer versions of python/numpy and not crash when heap cannot be
allocated

Change-Id: I2a83f6e2720de331188ae5b42dd8c86b14900288

Former-commit-id: 67630fce01ecbd64a760211820af5b5eaff4cade
 2014-10-15 09:02:07 -05:00
Steve Harris
6cf62253a8 Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 
Former-commit-id: 230f4413d69d25ca4e8cafc23ec80b3bb79fea63
 2014-09-23 15:30:55 -05:00
Steve Harris
c8bee38fc7 Omaha #3300 - Added compiled nativeLib binaries to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 
Former-commit-id: 785a6cb7ef5856e0bc0beb3fcf5657f74934111b
 2014-09-23 12:02:08 -05:00
Steve Harris
b979960b7b Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
	edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java

Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
 2014-09-23 11:41:10 -05:00
Brian.Dyke
05145d2f0d VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so 
Former-commit-id: 0448deecda7c53ac65bc66bc9751ec0e7f83eee1
 2014-09-17 15:39:57 -04:00
Chip Gobs
51f2d9df8e Merge remote-tracking branch 'origin/master_14.3.1' into ohd_14.3.1_v6 
Former-commit-id: 2131a59fecbb9bc01dd395360f7f8dafe6d76b0b
 2014-09-03 14:48:29 -04:00
Steve Harris
5d58625abc Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1 
Conflicts:
	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/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
 2014-08-29 10:17:52 -05:00
Brian.Dyke
aa83bf804f Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
 2014-08-27 11:19:19 -04:00
Brian.Dyke
dd9d7133d9 Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py

Former-commit-id: 65e2373d13c7d5b33d579b87d98a8265252ea391
 2014-08-22 14:16:22 -04:00