Commit graph

144 commits

Author SHA1 Message Date
Dave Hladky
0ac4de6ad0 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	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.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]
Former-commit-id: 333bf8b36d
2014-05-05 12:15:14 -05:00
Ben Steffensmeier
bcc02476c6 Issue #2946 Fix auxillary purge rules.
Former-commit-id: 4c06cd6f5e [formerly a62bdff82f96e79737269686598687ecef746c01]
Former-commit-id: 2850d80610
2014-04-30 14:38:27 -05:00
Brian.Dyke
e56bd61ee6 Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.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.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]
Former-commit-id: 278aab6b6f
2014-04-30 12:57:09 -04:00
Richard Peter
86d1ff9427 Issue #2995: Update DB Class Finder to search all plugin jars
Change-Id: I42b5207372aa9d6f07afff0d18819c60b85fb3f8

Former-commit-id: 5c0f9b5ba5 [formerly f3fe2db624f7f9e6c7b0b65d600ddba5e42de361]
Former-commit-id: 44701f31f2
2014-04-25 13:07:59 -05:00
Richard Peter
5b3ffb51b0 Merge "Issue #2726: Add hooks to stop archiving processes during shutdown." into development
Former-commit-id: 225d95171c [formerly 98e0a18741b559dff887db980d95965edf5f7cae]
Former-commit-id: 0b765efce0
2014-04-24 19:15:56 -05:00
Richard Peter
5b14b22ee1 Issue #2726: Add hooks to stop archiving processes during shutdown.
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a

Former-commit-id: 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]
Former-commit-id: 37342cba87
2014-04-24 19:11:50 -05:00
Nate Jensen
91df50ded7 Issue #2060 remove dependency on grid dataURI column from more of DAT
Change-Id: I9123d2508f359e65124f90dafdfdf5efeaf1241a

Former-commit-id: e1eaca8071 [formerly e7963b0bcea141f33a00c264b26ae264d00f3abf]
Former-commit-id: 6cbd35aa47
2014-04-24 15:04:54 -05:00
Richard Peter
64ba553b42 Merge "Issue #2946 allow multiple purge files for a plugin." into development
Former-commit-id: 4d28d5148d [formerly 0d39f52b3b31f0103f9cdfb60ddae4728127467d]
Former-commit-id: ecf4dfd354
2014-04-22 14:22:00 -05:00
Ben Steffensmeier
3d3b2182e1 Issue #2946 allow multiple purge files for a plugin.
Former-commit-id: 1384be3960 [formerly 044feb48d66730cbc33b1da4b160e0bcd362bbd6]
Former-commit-id: 40bb46402f
2014-04-22 13:18:04 -05:00
Nate Jensen
263611f905 Issue #2060 dropping grid dataURI column
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 5dfb652775 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]
Former-commit-id: a37a2afe18
2014-04-21 17:34:39 -05:00
Dave Hladky
91bd735d47 Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]
Former-commit-id: 61fc2fea51
2014-04-21 12:26:47 -05:00
Richard Peter
22a01edbb7 Merge "Issue #2862 Implements locks on case creation." into development
Former-commit-id: 181ffee3db [formerly e2c246299716bc2eba90a16c2c69cf1e0a9a6913]
Former-commit-id: 19755418f8
2014-04-14 13:28:26 -05:00
Richard Peter
e4be1f24e7 Issue #2726: Edex graceful shutdown.
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]
Former-commit-id: dbba727f3d
2014-04-14 13:10:11 -05:00
Richard Peter
cd51f3fa87 Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
	edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Former-commit-id: 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]
Former-commit-id: 3575d6586f
2014-04-11 16:23:09 -05:00
Roger Ferrel
16fab01b8b Issue #2862 Implements locks on case creation.
Change-Id: Ic0975b699e54b30f152422782e11ac04c310cb1b

Former-commit-id: cfea0489d7 [formerly b10c78a4f3cb7abb265d8c383c6bc2912d166720]
Former-commit-id: 5570261d74
2014-04-11 16:07:58 -05:00
Roger Ferrel
032ee7ef77 Issue #2862 The DatabaseArchiver and ArhivePurger now have write cluster locks.
Change-Id: I067b6037d5b044229f2c1e5acdd7ec5f7a372908

Former-commit-id: c86d738d5b [formerly 09e4f116a482f2a197c01cdec3609e10e1d2285d]
Former-commit-id: 226b1be015
2014-04-09 13:57:55 -05:00
Mike Duff
ff07b90659 Issue #2941 - Sort data before returning
Former-commit-id: 4db73e42a5 [formerly 6c9ebb120761257af5e8d6ec08fa9634e5e55185]
Former-commit-id: 73a011b940
2014-03-24 08:19:21 -05:00
Ben Steffensmeier
c0b478eb97 Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.
Former-commit-id: 8650074737 [formerly ba5ff870337c7ac66d633077d84de867e5df967c]
Former-commit-id: 9122b6da99
2014-03-07 18:15:32 -06:00
Steve Harris
51b755a476 Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]
Former-commit-id: 873bd6b889
2014-03-07 15:43:40 -06:00
Steve Harris
068297b90a Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: 40b543f9a8 [formerly 81f446dbc2ae8f8c54cba5b29ed57f113d318160]
Former-commit-id: 92232fa063
2014-03-07 15:16:18 -06:00
Steve Harris
dc7d6ceced Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]
Former-commit-id: 8b6263bfbd
2014-03-06 18:31:10 -06:00
Steve Harris
3ba28aabea Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]
Former-commit-id: 069093884f
2014-03-06 08:39:43 -06:00
Benjamin Phillippe
d339e232f4 Issue #2769: Registry database deadlocking fixes/performance improvements
Change-Id: I7a1a0b5397ff179d60d7303f2f22e4cd95940df0

Former-commit-id: 5483d6d7ae [formerly a4e02448e88b8b0bbad62794b41d0ef1bd1c6b6e]
Former-commit-id: ed050996a2
2014-03-03 10:57:16 -06:00
Richard Peter
7bd6a07913 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]
Former-commit-id: 0e25ae35c1
2014-02-27 15:18:26 -06:00
Ron Anderson
e7f2b6883d Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 32bcf9d0d0
2014-02-18 10:45:20 -06:00
Brian.Dyke
f3d34b0c38 14.1.1-17 baseline
Former-commit-id: 23280af290 [formerly 810229668fd7ff81b5c426161d496fc62e24b75c]
Former-commit-id: 180d1356cd
2014-02-04 12:33:46 -05:00
Steve Harris
a465718a0d Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]
Former-commit-id: 24ab7cff49
2014-01-21 12:36:54 -06:00
Richard Peter
e6bc012925 Merge "Issue #2459 - Remove unscheduled status from UI" into omaha_14.2.1
Former-commit-id: 29ba337367 [formerly afdfd6b07687c9de20dad3f352db34fba6ade93c]
Former-commit-id: 6b859c9a42
2014-01-20 17:21:21 -06:00
Steve Harris
5fcccbff1b Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 9371eeeee0 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]
Former-commit-id: 454d557884
2014-01-20 10:17:44 -06:00
Mike Duff
0cfa9ee36c Issue #2459 - Remove unscheduled status from UI
Former-commit-id: 25d1d39fc2 [formerly ddbef8fd122a6be6c32ff9a58659e712c2912a07]
Former-commit-id: 93cb80cfc7
2014-01-17 15:34:48 -06:00
Richard Peter
f30181d730 Issue #2125: Clean up hibernate warnings
Change-Id: Ieb78e7e518a90f09c8db6d72213d5bffa357414e

Former-commit-id: 0c058f461c [formerly 4a99614b887fe02e1ad9831fc9414ceb6808ba7b]
Former-commit-id: e2d20753e1
2014-01-17 14:12:34 -06:00
Ron Anderson
0bde38cef3 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: 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]
Former-commit-id: ba7a25a88f
2014-01-13 17:45:20 -06:00
Nate Jensen
459771f66d Issue #2359 minor request JVM startup safety
Change-Id: I17a5f3217ac5a2f2d53660bdb45a6009c8f27004

Former-commit-id: f83a473653 [formerly 3916523cd702e367a6d66743b0517872475a0c36]
Former-commit-id: 24560cf307
2014-01-07 13:25:45 -06:00
Max Schenkelberg
b3aed99142 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: cc2080449c [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]
Former-commit-id: 16046a4dde
2014-01-06 17:03:45 -06:00
Steve Harris
6df7c67f95 14.1.1-14 baseline
Former-commit-id: 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]
Former-commit-id: f2ad9da4eb
2014-01-06 14:02:30 -05:00
Benjamin Phillippe
b2c565c173 Issue #2613 Registry performance enhancements
Change-Id: Id50678b2af78adff17fe622201a65d5530e68c21

Former-commit-id: 0cb4e61261 [formerly 8d62013d772cf3a15b8f0fa2be7d80955dbfd74d]
Former-commit-id: 969099d4c4
2013-12-11 12:20:12 -06:00
Brian Clements
d35fc591d2 Issue #2393 removed pypies interpolation
updated datastore interface
updated pypies python code
updated python generated from java classes
moved in-java interpolation code from sat dao to utility classes
changed ncep mcidas dao to use in-java interpolation
changed VIIRS dao to use common interpolation code


Former-commit-id: 0f40ae2b99 [formerly 6f9ad823de5d0b30ae7c8206b4a4fdf1e3a2b22b]
Former-commit-id: fe58826a1e
2013-11-20 08:40:12 -06:00
Richard Peter
7ba466f5a6 Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.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.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]
Former-commit-id: 306bd6fae1
2013-11-12 11:11:36 -06:00
Nate Jensen
040f022e5d Issue #2361 fix saving hydro table objects
Change-Id: I38e6cd44359c60e88132b297beee66cede0437de

Former-commit-id: 08441efbb7 [formerly 0f406375b030a87d3fa12e46255897bfa469119d]
Former-commit-id: 7a27264094
2013-11-08 12:37:26 -06:00
Steve Harris
80614c0e52 14.1.1-7 baseline
Former-commit-id: 4fff87723f [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]
Former-commit-id: 3328e2dd1d
2013-11-06 14:16:14 -05:00
Bryan Kowal
38464427d3 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 bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: feaacd9356
2013-10-31 15:34:46 -05:00
Steve Harris
82dec19b6a 14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
2013-10-28 10:55:16 -04:00
Benjamin Phillippe
12d23800c7 Issue #1682 Refactored Registry querying to conform to EBXML 4.0 spec
Change-Id: If6d3579305afbb279057a264033736fc126b7849

Former-commit-id: ed23a786d6 [formerly 5112ee9931a1678fee37dd725a28dd6fff1e7ec9]
Former-commit-id: a4e5cd5fd7
2013-10-18 09:20:40 -05:00
Richard Peter
cbf53120dd Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
	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/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 0787e7cc86 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]
Former-commit-id: cd504e4e98
2013-10-15 11:36:12 -05:00
Nate Jensen
d7e4576380 Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 40847d0edf [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]
Former-commit-id: b49a2ceb2f
2013-10-14 15:30:09 -05:00
Steve Harris
1581adfa64 Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: 545d7ca463 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]
Former-commit-id: 852c02c848
2013-10-14 09:28:24 -05:00
Steve Harris
1efbba7a4b 13.5.2-10 baseline
Former-commit-id: c3d29c0fa0 [formerly 83863a9833f309203af0ee34d503bf280e596397]
Former-commit-id: 46c351de6c
2013-10-14 09:59:31 -04:00
Richard Peter
f141fdd5ab Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml

Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371

Former-commit-id: b6395cc834 [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]
Former-commit-id: 9adbe25ceb
2013-10-08 10:59:50 -05:00
Bryan Kowal
60c544c7a9 Issue #2272 - EDEX updates for ALR
- added an EDEX ingest hydro mode
- a cluster task can now be specified via an EDEX properties file
- Amend: added purge-logs to hydro ingest
- Amend: created the hydro request mode
- Amend: created environment properties files for the new EDEX instances
- Amend: cluster prefix is now defined statically

Change-Id: Ic60c988751cf75b9433c11fa71c04ab5190f6369

Former-commit-id: 73690a97aa [formerly d1f201a579b9a0421295df26c9ad17717581073f]
Former-commit-id: 26cf5dad60
2013-10-02 15:49:16 -05:00
Dave Hladky
e6d2e37caf Issue #2399 Updated logging of duplicates
Change-Id: Id81a219e58734ec6894f198b97b5532cc3b868de

Former-commit-id: a95c022799 [formerly 91e608f8b14d4634e4d223fe732b37a0fdc243e0]
Former-commit-id: 6de76d215d
2013-09-23 13:39:34 -05:00