Richard Peter
600b2a7bdf
Omaha #4846 - Fix GAFFDB sql grammar
...
Change-Id: Iccf1a1b604c8f903b506c20b9fd50162ea9c35ea
Former-commit-id: 8e1c394eb1ccf6d81ebd950a3fd478237f09b51d
2015-09-08 13:59:20 -05:00
Bryan Kowal
db52a9bc15
Omaha #4735 - added missing includes to hydro modes for ALR EDEX.
...
Former-commit-id: f944294e35cc09bf7f9863d4762f48f102686ed9
2015-08-24 10:40:00 -05:00
David Friedman
4bdfeb8da8
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
...
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
Richard Peter
c2323b7a00
Omaha #4500 - Fix sql queries
...
Change-Id: I2ffeccf4d8a170d229490abb2fb7c9f32eefcf9d
Former-commit-id: e62c5a7062763c968556043812002aa3005f1df9
2015-07-13 11:09:23 -05:00
Richard Peter
badc21926a
Omaha #4500 - Prevent SQL Injection
...
Change-Id: Ia61d5283ac60d01af892440218cb199365a3f79d
Former-commit-id: 70b8f0d02904abaf7633dfd131672f139f37dc8f
2015-07-09 14:36:47 -05:00
steve.naples
4fef05bf11
ASM #15045 Fixed issue with DPA decoder not decoding properly in clustered environment.
...
Change-Id: I4d972b3602ec0decf24bd73db69ec033704e0276
Former-commit-id: 0bfdd6a98f26ddf9847ebc8eebcfca1dfdcd5e58
2015-07-01 18:47:18 +00:00
Nathan Bowler
aec9063739
Omaha #3992 Only retrieve NLDN data. Deduplicate primary keys.
...
Change-Id: I877dc47ce08428858b6119e5d2a617ecb75591be
Former-commit-id: 2692dfc7871b2c326b6e59ff7a3fc4ccc07b7b71
2015-02-27 07:37:02 -05:00
Steve Harris
78b41638b9
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
...
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
2015-02-20 13:17:47 -06:00
Michael Gamazaychikov
9ffad49fa0
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
...
Change-Id: Ib5c6bb89c57022b61260adbaa08760e5df05ad61
Former-commit-id: 20efa852dcc64c80890abed6b2882a205b37cf43
2015-02-10 15:21:32 -05:00
Steve Harris
8eb10d0456
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Steve Harris
9234ceb485
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06: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
Brian Clements
48b452b7b4
Omaha #3692 alert alarm record is no longer a singleton
...
Change-Id: Ib995bc47699c515c2702e5aab677929a939a62a8
Former-commit-id: ff9be6a031b01f96eca5c390d2c5156069cfc3bd
2015-01-07 13:55:24 -06:00
Michael Gamazaychikov
ce2c685da4
ASM #16736 - OHD's RunReportAlarm Service does not notify EDEX's AlarmAlertNotification Observer.
...
Change-Id: I74ff5b0abb7df0434bb7f66db080447a9d644266
Former-commit-id: 5c31d213c84dfa701eda80712ad5014bf4a012aa
2014-12-15 08:40:22 -05:00
Jingtao Deng
831dbd1db6
VLab Issue #5062 - DR17605 Hydro Alert/Alarm mismatched report format between A1 and A2; fixes #5062
...
Change-Id: Ie5d29a5f2d375d473fe79b990019f757b20ad0bc
Former-commit-id: ae2c45f9cd0ee5ecb8278ec99cb145525b2ce3a3
2014-12-11 11:14:52 -05:00
Nate Jensen
4a934687aa
Omaha #3015 correct usage of Coordinate(lon, lat)
...
Change-Id: I30029df3e963ee16e2612d5e9f29e7a0ca05a7a8
Former-commit-id: 67c3f28fa0edf3aa41726c6a9d2f18b5af586ab1
2014-12-04 19:05:38 -06:00
Nate Jensen
8dbe6abbe4
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06: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
Brian Clements
246dcda707
Omaha #3015 improved exception handling for MPE lightning
...
Change-Id: I3ab01d811bf49dbeced48d43744b93d470815636
Former-commit-id: 57f997f93e7e063ad6f24074ab3d1b8f02962bb8
2014-09-17 10:30:08 -05:00
Nate Jensen
8c5802837e
Omaha #3549 fix spelling in exceptions
...
Change-Id: I4f9689cd0311b2e257b0d2150a8ffb06028e1a13
Former-commit-id: 6b301dfa92787488394a868c3fb28d0cea6fae3a
2014-08-20 13:28:03 -05:00
Greg Armendariz
09f6bd471c
Omaha #2914 - Remove calls to PropertiesFactory
...
Change-Id: I1dd1696b86411f8f9707deb7c54a75c6d669b3be
Former-commit-id: b59ebac85404fba5657e9041b6f2be7a1959fd9c
2014-07-17 15:41:38 -05:00
Brian Clements
f39896b2d1
Omaha #3226 added total lightning decoder
...
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning
Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3
Former-commit-id: e2583481a77d08249030838ebd52eed6e54b2986
2014-06-06 14:39:57 -05:00
Brian Clements
334bb53dea
Omaha #3179 split modes.xml into plugin modes files
...
Change-Id: I31e59b28fca166aff0cbd9ca13bf81aa67d6b46a
Former-commit-id: e626f47c9bb8900af2f4734513b2c94b83f082c8
2014-05-28 13:32:18 -05:00
Brian Clements
da7d5888b0
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c
2014-05-20 16:07:20 -05:00
Brian Clements
6bd43f79ff
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
2014-05-14 13:45:09 -05:00
Nate Jensen
170106ad44
Issue #2060 log successful sat precip file creation
...
Change-Id: I40df627645e0c0e089609f8dcc56b8351a4c56f1
Former-commit-id: b3158ae940ab59a7a96b4650f0f956c82b0c9d49
2014-05-07 09:44:20 -05:00
Nate Jensen
d82f6e5ff6
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: cf0bb31583f0ec0b2135aa9101f3247e88e877d0
2014-05-05 13:06:08 -05:00
Nate Jensen
5dfb652775
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 1aab87d9572089a09351ebdfb8fbcef884866feb
2014-04-21 17:34:39 -05:00
Richard Peter
17196b5dcd
Issue #2726 : Edex graceful shutdown.
...
Refactored to use inheritance and separate logic where possible.
Addressed comments.
Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6
Former-commit-id: 6e015b3f61c20635077d6e8271e9b763e5a32fe1
2014-04-14 13:10:11 -05:00
Nate Jensen
8b1543c60c
Merge "Issue #2675 - Change GAFF to be called from Quartz. Added spring file." into development
...
Former-commit-id: f50ab285eb616ec2867907410deb3862875304e9
2014-04-14 08:58:55 -05:00
Richard Peter
21ae3b5fcd
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: bd13bc332bcdd87723bec8669885f4594ad483b9
2014-04-11 16:23:09 -05:00
Mike Duff
9e0d6b3b1f
Issue #2675 - Change GAFF to be called from Quartz. Added spring file.
...
Change-Id: I38f2890097e074cc42735657855ffff97a455707
Former-commit-id: c75780f9e3c7b9a5447b0f72b11e42a3c8dce68b
2014-04-11 08:15:51 -05:00
Mike Duff
235080c256
Issue #2952 - Change MPE fieldgen to use thriftSrv
...
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3
Former-commit-id: 182b9f69c72332e73cdda26ebbebedb4abc059b0
2014-03-31 15:08:33 -05:00
David Friedman
f146c7bcd0
Merge branch 'master_14.2.2' into asm_14.2.2
...
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
2014-03-27 19:17:03 +00:00
steve.naples
1aa970164f
ASM #428 Updated SATPRE file header to correct reftime.
...
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204
Former-commit-id: e51a12ae977528eb85d2c59505ac5be92d945cfe
2014-03-19 18:16:41 +00:00
Steve Harris
f60aba35d6
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml
Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c
2014-03-07 15:43:40 -06:00
Steve Harris
ffcc34f8d4
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: 889200c9eb3fbb835f8fef067476799f30a7a7e0
2014-03-06 08:39:43 -06:00
Richard Peter
1c150e6e8b
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: a47eaa9af45db41391fe46e36ec0793f70d06ad6
2014-02-27 15:18:26 -06:00
Brian.Dyke
10b723647b
OB_14.1.1-19 baseline
...
Former-commit-id: db2a591456383d8f980d33757e8c161bdcc01d3a
2014-02-21 06:50:59 -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
Steve Harris
69dc3d835b
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: 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90
2014-01-21 12:36:54 -06: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
Max Schenkelberg
cc2080449c
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: b65366dcdfa48e431b5c8bf10a72879b111cfd8d
2014-01-06 17:03:45 -06:00
Steve Harris
9ef1c841b9
14.1.1-14 baseline
...
Former-commit-id: 46bdb43889bdc681fec2aba45004a1583caaa6ae
2014-01-06 14:02:30 -05:00
Richard Peter
fbda83aeb9
Issue #2170 : Update Plugin Notification Framework
...
Change-Id: I2ec99fadbe2f383bb0892c59601350395f1e5277
Former-commit-id: 081a19d5cfca3d717a332357dbaead199767e0b8
2013-12-03 11:41:21 -06:00
Steve Harris
4fff87723f
14.1.1-7 baseline
...
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
2013-11-06 14:16:14 -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
Nate Jensen
40847d0edf
Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
...
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e
Former-commit-id: 16205ab7302195e99c8af69f9d24b41bca869ce3
2013-10-14 15:30:09 -05:00
