Steve Harris
e4202dd626
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
2016-01-20 16:49:18 -06:00
Ron Anderson
24bc0a3344
Omaha #5054 Fix Dialog parenting
...
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
2016-01-19 09:19:13 -06:00
Ron Anderson
4279c9f227
Omaha #5054 Fix location of GfeConfigDialog in multimonitor display.
...
(cherry picked from commit a19811a730#5054 Fix Text workstation window locations on multimonitor display
(cherry picked from commit 5085377b9d#5054 Fixed resizing of AlertViz bar on multimonitor displayes. Code cleanup.
(cherry picked from commit d6f0f5535e
2016-01-13 18:54:49 -06:00
Shawn.Hooper
bd27f40c6d
Merge tag 'OB_16.1.2-9' into master_16.2.1
...
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
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/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Ying-Lian.Shi
f889d9eb06
ASM #18174 AlertViz message corrections
...
Change-Id: Idbda664da8bd8e09b687a45a5a3b3f4fd09f7e9e
Former-commit-id: c13473616ac0096585fb8bb1e8456c98312550a8
2015-11-05 12:40:57 +00:00
Nate Jensen
84cda18bf2
Omaha #4654 register DESK localization level with alertviz
...
Change-Id: I4e5ab85bf7aa96f2a61744022653f96091548cc5
Former-commit-id: 8c2e63d82566bd7f508260b3315909b12c44c229
2015-09-21 14:32:40 -05:00
Slav Korolev
ecfe206c0f
Omaha #4654 - Added localization level filters to AlertViz messages. Added input test.
...
Former-commit-id: d645ec83203466c7584068fce8a2945f2338d4d0
2015-08-14 12:54:47 -04:00
Ron Anderson
cb6dadd09b
Merge "Omaha #4654 - Added localization level filters to AlertViz messages." into omaha_16.2.1
...
Former-commit-id: ed5d696b88f37dda3fe938340d3254be0ce251fc
2015-08-04 14:36:07 -05:00
David Lovely
b9e10fcf31
Omaha #4694 Logback configurations will now append user.home to LOGDIR.
...
Change-Id: I1ed4b3c59d934ac703bd5481b2277beca4ff9568
Former-commit-id: 825064c84ebfa384703074b9be520f03fbb83e8d
2015-08-04 12:38:45 -05:00
Slav Korolev
b0d93c1b99
Omaha #4654 - Added localization level filters to AlertViz messages.
...
Former-commit-id: acf06c64c7495c930c25924cccbe22f358ad7dad
2015-08-04 12:14:32 -04: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
Daniel.Huffman
c1dde0afa1
ASM #17167 Remove the nulls from incoming xmlString
...
Change-Id: I1a50c718ee6b9872f58cac61831eeab6092a04ec
Former-commit-id: e8139effcb2bba62bc2ef429d812c709bc773cd2
2015-07-09 12:36:45 +00:00
Nate Jensen
0c13729911
Omaha #4473 fix alertviz listening to edex topic
...
Change-Id: Ib170d781b6d5ba38d158819dedc662a01410a7aa
Former-commit-id: 3d99375772f5113a48b05051fa72cf1e26f7c7be
2015-06-29 17:31:28 -05:00
Roger Ferrel
9eebfd0c0e
Omaha #4148 Changes to script to use fewer env variables and update logback files.
...
Change-Id: I8b5b82c4ee371ab10c571a6075c71143bb9e0100
Former-commit-id: 20c1d6c1851012b49f18d43aa6203e4dc51cbd72
2015-06-23 15:25:26 -05:00
Nate Jensen
8742617590
Omaha #4473 apply sanity to startup ordering
...
Change-Id: I6ec03a4028288186e4ad23cf3cc62b2e72b9a01f
Former-commit-id: 7f7c5887625fc19ba02aa6616bda3a7ddafeba76
2015-06-15 14:36:49 -05:00
Nate Jensen
ef596144a0
Omaha #4473 update references to moved logback classes
...
Change-Id: I68ac77c7f6f74dacac0d70a6155a93cf37a1873a
Former-commit-id: 339bea8a304cec0afad5b363709689e55fe744c5
2015-06-09 10:41:23 -05:00
Nate Jensen
b5b83d8140
Merge "Omaha #4473 send viz log messages to slf4j enable eclipse logging to slf4j start alertviz ui through osgi" into omaha_16.1.1
...
Former-commit-id: 73de6eb68419300bb21ea2867c393ff6aaadb163
2015-06-09 08:56:22 -05:00
Nate Jensen
f464c4e871
Omaha #4473 send viz log messages to slf4j
...
enable eclipse logging to slf4j
start alertviz ui through osgi
Change-Id: I54ccd31d9ee0e19dfb2a8c9f63dd5c9730c8c8ca
Former-commit-id: cde25bde94cadc5125ece8d5894c644d54d486e2
2015-06-04 19:34:10 -05:00
Steve Harris
7e7cdd1c7a
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
...
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
2015-06-04 11:08:19 -05:00
Richard Peter
37ca477204
Omaha #4346 - Allow alertViz to load configuration from common_static
...
Change-Id: I121aa90f405f4c9deea7f9627bd2ed60f31a1a91
Former-commit-id: 41fcc19791a1c6ba725ebe38b51d87f8e1c9af7c
2015-05-20 16:28:56 -05:00
David Lovely
80dc4c85d9
Omaha #4146 Bundled class files in a jar when unpacked.
...
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Roger Ferrel
e5d09b40ec
Omaha #4346 Merge base xml files into base configuration.
...
Change-Id: I056a4e04cb20625408a7a3e117e0cb0babad4a0d
Former-commit-id: ed292bad0ffffd57fecae3e8d80f125fd948f903
2015-04-09 07:58:33 -05:00
Nate Jensen
f5e4751703
Omaha #4234 remove code that doesn't work anyway
...
Change-Id: I6747dcc1ccb3f7c3b424b996d63417f4a86a171b
Former-commit-id: 26b21f4db52aa6dd802a5de460b98e1758bc6872
2015-03-18 11:50:10 -05:00
Roger Ferrel
e9a4ee8baa
Omaha #4015 Clean up.
...
Former-commit-id: cefbada02e207287fb26b1dd629270d591f86635
2015-02-24 12:13:50 -06:00
Roger Ferrel
d15abc2257
Omaha #4015 Move redundant entries to logback include files for alertviz and edex.
...
Change-Id: I23c592a1c05eda309047e73d136a3e1092143611
Former-commit-id: 6e840bc94847162ef66aab3ce961e6fa222801c5
2015-02-23 12:27:50 -06:00
Ben Steffensmeier
e32037b42a
Omaha #3390 Remove references to deprecated API.
...
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
2014-09-02 15:39:45 -05:00
Nate Jensen
5e8797ef77
Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
...
Former-commit-id: 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae
2014-08-05 10:33:40 -05:00
Nate Jensen
7fb8a476f7
Omaha #3356 remove unreferenced registered buddy policies
...
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6
Former-commit-id: 9ff58fb62685fbb2f9322842ecdab40c78a8536e
2014-08-05 09:27:10 -05:00
Steve Harris
bf9a0fa5de
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.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/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
Former-commit-id: f7d474895366eb23ae5eef242a4568f911435aa3
2014-08-04 22:20:29 -05:00
Nate Jensen
857f1b70cc
Omaha #3356 remove unnecessary usage of ext and global buddy policies
...
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d
Former-commit-id: 41306351920aee44bdf2d9648616ddc8a4511632
2014-08-04 12:30:55 -05:00
Brian.Dyke
270d2b0ddb
Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076
2014-08-04 13:10:13 -04:00
Benjamin Phillippe
4e1d93abf8
Omaha #3379 Removing DWR
...
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
2014-07-11 11:56:44 -05:00
Nate Jensen
939fde1575
Issue #3337 disable logback packaging data in cave
...
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
2014-07-02 09:24:15 -05:00
Max Schenkelberg
cbf8b9249c
Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
...
Amend: Added comments and cleaned up preference store
Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d
Former-commit-id: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Max Schenkelberg
87a6db7853
Issue #2620 Fixed manifest issues for baseline p2 export
...
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3
Former-commit-id: aaf90365b8855551b0cc22a8a95ae7e0b55f52ff
2014-01-20 13:54:27 -06:00
Nate Jensen
e13700ac63
Issue #2142 same logging behavior for ufstatus and eclipse internal status messages
...
Change-Id: Ia488e8dd82cc41114ee2b80ecdbf00c3d85f8aa7
Former-commit-id: 25d258fc932799955ff66b76a11c979e6fa59543
2013-08-27 18:33:24 -05:00
Nate Jensen
6f8c9aea0d
Issue #2142 when logging internally, let loggers format message and stacktrace
...
Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576
Former-commit-id: 2de8d8d887a50747abc5d2d020b65f5c12dd819c
2013-08-27 14:53:29 -05:00
Nate Jensen
e06ab02275
Issue #2142 fix cave logs of ufstatus messages on deployed systems
...
Change-Id: Ib873d34781953dd11b612a92602435a618e8f228
Former-commit-id: 5b2fec7a5e94e9352ae53091e20257aa8ee7a3d6
2013-08-26 12:28:31 -05:00
Max Schenkelberg
d79cfe8ad1
Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
...
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f
Former-commit-id: 5c707a35dcaedf5ae37119e56503aa8af59631fc
2013-08-09 14:24:49 -05:00
Nate Jensen
a9f5465c99
Issue #2142 remove more dependencies on edex.common
...
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f
Former-commit-id: f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5
2013-08-08 14:46:52 -05:00
Nate Jensen
be9315642b
Issue #2027 upgrade version of derby
...
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4
Former-commit-id: fe74cd780a74814665121c4ed334829f4a42a0ef
2013-08-07 16:44:30 -05:00
Nate Jensen
a0aeeedd23
Issue #2142 logback cleanup
...
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1
Former-commit-id: 38ee29e206824a1beeaad5837d731804b4affbdc
2013-07-17 14:03:43 -05:00
Max Schenkelberg
50825200a1
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: f47d21972b86d8c2c757874c5e450f93e5704133
2013-07-15 14:26:15 -05:00
Nate Jensen
db6152e524
Issue #2142 initial cutover from log4j to SLF4J and logback
...
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 7725d8a6cd00b3c30856b48ef86ab081b67d400b
2013-07-01 14:41:05 -05:00
Steve Harris
2327205cb7
Merge branch 'omaha_13.4.1' into development
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java
Former-commit-id: 43499d1a76f65804a5e74894cad3186765de3501
2013-06-06 15:46:23 -05:00
Ron Anderson
859b72a714
Issue #2026 Improved alertviz error logging
...
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8
Former-commit-id: d2418d309830a5063fcd90fd18a8d636574ddfbb
2013-06-05 12:05:15 -05:00
Nate Jensen
d476f02796
Issue #1638 fix mistakes
...
Change-Id: I7cf9d0393d8ac5ca7459a5ebfb7660e101ae0da5
Former-commit-id: f5a939794ed07e77c7df23a779ca61c272aa546c
2013-04-30 13:45:14 -05:00
Max Schenkelberg
126be0cfe5
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae
2013-03-22 10:54:44 -05:00
Max Schenkelberg
e0ba97d547
Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
...
Amend: Accepted ticket for work, again! Ensured uframe product project was not deleted
Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719
Former-commit-id: 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b
2013-02-27 11:50:38 -06:00
Steve Harris
4ba416aeb3
13.1.2-2 baseline
...
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
2013-01-06 14:32:24 -06:00
