Shawn.Hooper
83906db315
ASM #17024 - Moved ndmMenuIngester.sh to build/deploy.edex.awips2/esb/bin/
...
Change-Id: I13f0db113db1582c57c6f2a42a5b2903a118530b
Former-commit-id: 209589704fecd76aae472171ef6266eab39cefbb
2015-05-04 10:53:21 -04:00
Shawn.Hooper
c03499c025
Merge branch 'master_15.1.1' into asm_15.1.1
...
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267
Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
2015-04-24 15:44:14 -04:00
Michael Gamazaychikov
5bf5ce4bbe
ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed.
...
Change-Id: Idca93f26c05d1d3fc73f0f4c7c3b24a736bc01c0
Former-commit-id: c815d87b1e4c30f9be0406c622c0df27f389a050
2015-04-21 15:04:16 -04:00
Michael Gamazaychikov
289b526abc
ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed.
...
Change-Id: I2f4b04804c65ed0de14957880b6f57d3308e5889
Former-commit-id: 52371f5e58004f059a4fdb569948c5320ad9d57c
2015-04-17 07:42:02 -04:00
Greg Armendariz
4623588cc5
Omaha #4330 - Fix developer build
...
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2
Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
2015-04-06 10:47:23 -05: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
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
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
85b687be0b
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05: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
Greg Armendariz
bd3a7e13ac
Omaha #3299 - Remove fits plugin from awips2-edex-cots feature
...
Former-commit-id: 4ddbeaba11bab77ece13ee46e89d34f141619701
2015-03-02 13:11:44 -06: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
Greg Armendariz
9d95e79cd7
Omaha #3299 - Add back correct jars, update deploy-install to search for plugins in optionaldirectories
...
Change-Id: I5aebad06117f7072d322b8d7cbfe4a14acc2fdf8
Former-commit-id: 3a09dc91fbeb7db16a99116ad2582932e3fd6e58
2015-02-26 14:03:17 -06:00
Greg Armendariz
1a3ca4f8df
Omaha #3299 - Updated deploy-install to find features
...
Change-Id: I107c16d832936d63af5dbc76b07166db119c95e2
Former-commit-id: a25d39959ccdc41ab99e0eaf4ad87559adfcb362
2015-02-25 09:51:49 -06:00
Ron Anderson
ebb221d935
Issue #4099 Fix ETNs for products that span year-end.
...
(cherry picked from commit c7a8c9b049ae8d73ffb61765f31374e01d1d2a33)
Former-commit-id: 7ca4dd9ba059035e366807d4928768121fdd0712
2015-02-24 12:09:29 -06:00
Fay.Liang
92d4e5b370
Merge branch 'omaha_14.4.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: c08dc1a7d558fba175460ef8255fc3b7b1db5c71
2015-02-13 09:29:20 -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
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
Michael Gamazaychikov
796871f02f
ASM #17103 - New dx3/4 hardware can drive EDEX OoM.
...
Change-Id: I0e466f39b50661cc0909158611aab2f7fdda06ba
Former-commit-id: e4444751f61adccf1cb62adf0f6cb1abc4ab6384
2015-02-10 10:35:32 -05:00
Greg Armendariz
d3658d0f28
Omaha #3299 - Modify RCM deploy script
...
Change-Id: I420acc08705ebc2f52cd52ab7954b4d8c16fef15
Former-commit-id: 97c6bded155fc58e59beecdb33016e5286e622c1
2015-02-06 11:20:43 -06: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
Fay.Liang
de502a310b
Merge branch 'master_14.4.1' into asm_14.4.1
...
Former-commit-id: 8f839ec64da04492e6cf109fdf47b95f08db5388
2015-02-03 16:04:56 -05: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
Steve Harris
b684848820
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
...
14.4.1-6
Former-commit-id: 6873606777f0c7c18928b0b0814050742c256dc2
2015-02-03 11:24:39 -06:00
Mike Duff
8f2350f660
Issue #4030 - Added functionality to convert NDM menu files to A2 menu
...
files and have them droped into the NDM endpoint.
Change-Id: Ieb87acafed0d9e756be49c3111ba97a921ca425e
Former-commit-id: 3f5edb033f8b54908adcd3a751eabe189570d338
2015-02-02 12:06:05 -06:00
Roger Ferrel
61ab864445
Omaha #4031 Implement preferrred AFOS first letter.
...
Change-Id: I1c011beaf078d08c79c02863ac8afd01c7318645
Former-commit-id: 776989760fa936913006924efb1e84832ffec31f
2015-01-30 13:01:01 -06:00
Rici.Yu
e9349a6701
ASM #17055 - fix activeTableChange logging
...
Change-Id: I863a43005685b5b73eb96d80f0ffa46d12ecfcbc
Former-commit-id: 777729392f9cdbbcfe3bbdd7ac4c19c714dfb31a
2015-01-30 13:19:40 -05: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
Nate Jensen
c4598baf19
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06: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
Jordan Gerth
e0fd068337
VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
...
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0
Former-commit-id: fe7454aac732eae6bd0024be122b819e909f98fa
2014-12-14 15:40:19 -06:00
Jason Burks
325f31f6ef
VLab Issue #5240 - Baseline LMA; fixes #5240
...
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd
Former-commit-id: a941dd68c3c5b42671ad78900d6d8f8231d70810
2014-12-08 21:01:19 +00:00
Bryan Kowal
90f15ff22c
Omaha #3508 - fix deploy-install for yajsw.
...
Former-commit-id: 75cf2b3e03ad446408c3d201e6e36bde5f1095f2
2014-12-05 09:38:47 -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
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
Nate Jensen
403e470682
Merge "Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30." into omaha_14.4.1
...
Former-commit-id: 8f7fa6b23c7a20b15c5f9bdfdac5add17aab336e
2014-11-11 09:11:18 -06:00
Steve Harris
9de825c332
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06: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
Brian.Dyke
acf00264f4
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Ron Anderson
30d031989e
Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
...
Former-commit-id: e076201872a69829228a6e78d632287839acf3d8
2014-10-28 15:15:26 -05:00
Benjamin Phillippe
52e3ba5914
Omaha #3454 Configuring Hibernate query plan cache settings
...
Former-commit-id: 0d18e110bf2266400b538d38c4f42078d78a5b41
2014-10-24 10:44:38 -05:00
Ron Anderson
5c1570eafd
Omaha #3685 Fix spell checker to use mixed case.
...
Fix bug in importShapefile
Change-Id: I818bef97b2306cb47e07d4885e77906d1fd5c793
Former-commit-id: 25ded2580ec97f4a966297f0af6dbb5d0e66956a
2014-10-23 09:02:16 -05:00
Richard Peter
2c21e72bf3
Merge "Omaha #3454 Upgrading to Hibernate 4.2.15" into omaha_14.4.1
...
Former-commit-id: 6b2879d8180a6b6f60a340977e3254ee5eb95213
2014-10-21 10:51:56 -05:00
Benjamin Phillippe
fdd16051e8
Omaha #3454 Upgrading to Hibernate 4.2.15
...
Change-Id: I4ab0970abf9755f69e09ad3d9c79084b76761c29
Former-commit-id: 293e59403b6d6e1d792d9fc6d8a0ac106a490bf5
2014-10-20 12:42:19 -05:00
Nate Jensen
73e15036de
Omaha #3299 fix xml attribute name
...
Change-Id: I9f0878d9179be0b633e1635eff4d961359a82eb8
Former-commit-id: fa064accaafc2a4dedd8574eec6faf1960c8bc70
2014-10-16 17:11:26 -05:00
Ron Anderson
bf5225906f
Issue #3684 Additional changes to keep IFPServers better synchronized
...
Change-Id: Ibb1f28d07a5792d4f23eb3232b75099b259a7064
Former-commit-id: 8a8f82e5916d4a71fa639eb16057e2c68276ecff
2014-10-07 11:51:39 -05:00
Brian Clements
81c73519c2
Omaha #3690 added tool to remove empty localization dirs
...
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701
Former-commit-id: a69773742e571a334ef1fd000ff8311805f9c737
2014-10-07 08:37:47 -05:00
Richard Peter
b5f23b8b98
Omaha #3300 Fix merge of 14.3.1-23
...
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9
Former-commit-id: 075f3f69cbf19d298398cb7c481668b97d4dad5d
2014-10-03 14:14:16 -05:00
Ben Steffensmeier
5b10ac2f36
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
...
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
2014-09-29 10:49:14 -05:00
Steve Harris
4c56844e29
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Airports.xml
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/FAA/Fix.xml
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/SubClassLocator.java
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/TearOffMenuDialog.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLDataMappingFactory.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarGSMResource.java
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
cave/com.raytheon.viz.ui/META-INF/MANIFEST.MF
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/colormap/ColorMapTree.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ColormapComp.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/web/IRegistryFederationManager.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TP.xml
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/IPathManager.java
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/PathManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/dao/ReplicationEventDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/WfsConnectionUtil.java
Former-commit-id: 69c52fb4a22997d0a0f9c620bd20f00b8c5fd4ce
2014-09-19 10:28:57 -05:00
