Commit graph

72 commits

Author SHA1 Message Date
mjames-upc
0b01029e68 cleaning up unidata_15.1.1 enough to launch in eclipse 2015-12-29 20:15:31 -07:00
Richard Peter
963da59dd2 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
Roger Ferrel
a26076f47c 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
83d109e2cf 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
f340c87441 Omaha #4015 Clean up.
Former-commit-id: cefbada02e207287fb26b1dd629270d591f86635
2015-02-24 12:13:50 -06:00
Roger Ferrel
dd3d9708d7 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
1d2144e840 Omaha #3390 Remove references to deprecated API.
Former-commit-id: ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3
2014-09-02 15:39:45 -05:00
Ben Steffensmeier
59e6ec282f Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly 1d2144e840 [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]
Former-commit-id: 1d2144e840
Former-commit-id: 950075dc59
2014-09-02 15:39:45 -05:00
Nate Jensen
04083235ad 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
6f8270f014 Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
Former-commit-id: 5e8797ef77 [formerly 04083235ad [formerly 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae]]
Former-commit-id: 04083235ad
Former-commit-id: 7165ef7f12
2014-08-05 10:33:40 -05:00
Nate Jensen
cc56bc4b3b Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

Former-commit-id: 9ff58fb62685fbb2f9322842ecdab40c78a8536e
2014-08-05 09:27:10 -05:00
Nate Jensen
b77d2ba410 Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

Former-commit-id: 7fb8a476f7 [formerly cc56bc4b3b [formerly 9ff58fb62685fbb2f9322842ecdab40c78a8536e]]
Former-commit-id: cc56bc4b3b
Former-commit-id: 69d1481634
2014-08-05 09:27:10 -05:00
Steve Harris
0fb743ec44 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
Steve Harris
d606269c5b 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: bf9a0fa5de [formerly 0fb743ec44 [formerly f7d474895366eb23ae5eef242a4568f911435aa3]]
Former-commit-id: 0fb743ec44
Former-commit-id: a92dc418c6
2014-08-04 22:20:29 -05:00
Nate Jensen
06a64080e7 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
Nate Jensen
9f0bd349b6 Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

Former-commit-id: 857f1b70cc [formerly 06a64080e7 [formerly 41306351920aee44bdf2d9648616ddc8a4511632]]
Former-commit-id: 06a64080e7
Former-commit-id: 41eb72aefd
2014-08-04 12:30:55 -05:00
Brian.Dyke
9abb02ea8a 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
Brian.Dyke
590e37a8f2 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: 270d2b0ddb [formerly 9abb02ea8a [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]
Former-commit-id: 9abb02ea8a
Former-commit-id: 301f3094be
2014-08-04 13:10:13 -04:00
Benjamin Phillippe
d110e8428b Omaha #3379 Removing DWR
Former-commit-id: a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e
2014-07-11 11:56:44 -05:00
Benjamin Phillippe
e613cb932e Omaha #3379 Removing DWR
Former-commit-id: 4e1d93abf8 [formerly d110e8428b [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]
Former-commit-id: d110e8428b
Former-commit-id: cc9e9b427a
2014-07-11 11:56:44 -05:00
Nate Jensen
c003d70168 Issue #3337 disable logback packaging data in cave
Former-commit-id: db10ba5a37dbe219110f4f902bf9257f2f220b3d
2014-07-02 09:24:15 -05:00
Nate Jensen
2baedbf6b8 Issue #3337 disable logback packaging data in cave
Former-commit-id: 939fde1575 [formerly c003d70168 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]
Former-commit-id: c003d70168
Former-commit-id: 56363ffc4a
2014-07-02 09:24:15 -05:00
Max Schenkelberg
a01a6d68d0 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
dbc6cc3fc6 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: cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]
Former-commit-id: a01a6d68d0
Former-commit-id: 59434c8a60
2014-03-04 09:23:36 -06:00
Max Schenkelberg
68aa666045 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: aaf90365b8855551b0cc22a8a95ae7e0b55f52ff
2014-01-20 13:54:27 -06:00
Max Schenkelberg
7073ea5e90 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 87a6db7853 [formerly 68aa666045 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]
Former-commit-id: 68aa666045
Former-commit-id: 1256748c42
2014-01-20 13:54:27 -06:00
Nate Jensen
3101962858 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
3a9373a893 Issue #2142 same logging behavior for ufstatus and eclipse internal status messages
Change-Id: Ia488e8dd82cc41114ee2b80ecdbf00c3d85f8aa7

Former-commit-id: e13700ac63 [formerly 3101962858 [formerly 25d258fc932799955ff66b76a11c979e6fa59543]]
Former-commit-id: 3101962858
Former-commit-id: e933ff43f4
2013-08-27 18:33:24 -05:00
Nate Jensen
d919e08791 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
62cf4798a3 Issue #2142 when logging internally, let loggers format message and stacktrace
Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576

Former-commit-id: 6f8c9aea0d [formerly d919e08791 [formerly 2de8d8d887a50747abc5d2d020b65f5c12dd819c]]
Former-commit-id: d919e08791
Former-commit-id: aa2336f598
2013-08-27 14:53:29 -05:00
Nate Jensen
4a2557405a 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
Nate Jensen
23636bb154 Issue #2142 fix cave logs of ufstatus messages on deployed systems
Change-Id: Ib873d34781953dd11b612a92602435a618e8f228

Former-commit-id: e06ab02275 [formerly 4a2557405a [formerly 5b2fec7a5e94e9352ae53091e20257aa8ee7a3d6]]
Former-commit-id: 4a2557405a
Former-commit-id: 6893790cc3
2013-08-26 12:28:31 -05:00
Max Schenkelberg
0f3c791120 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
Max Schenkelberg
cb1d5d1c5b 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: d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]
Former-commit-id: 0f3c791120
Former-commit-id: b95a96f4c9
2013-08-09 14:24:49 -05:00
Nate Jensen
a919490d00 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
3b787e12df Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]
Former-commit-id: a919490d00
Former-commit-id: cce952c0bc
2013-08-08 14:46:52 -05:00
Nate Jensen
ec01e6e872 Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: fe74cd780a74814665121c4ed334829f4a42a0ef
2013-08-07 16:44:30 -05:00
Nate Jensen
0aab8a628a Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]
Former-commit-id: ec01e6e872
Former-commit-id: 8968389383
2013-08-07 16:44:30 -05:00
Nate Jensen
81d9a28d53 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 38ee29e206824a1beeaad5837d731804b4affbdc
2013-07-17 14:03:43 -05:00
Nate Jensen
9c575f1754 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: a0aeeedd23 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]
Former-commit-id: 81d9a28d53
Former-commit-id: 621a4da9b7
2013-07-17 14:03:43 -05:00
Max Schenkelberg
63421a4819 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
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
2013-07-15 14:26:15 -05:00
Nate Jensen
316d6c09c6 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
Nate Jensen
338b0ae310 Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]
Former-commit-id: 316d6c09c6
Former-commit-id: a4de603bcf
2013-07-01 14:41:05 -05:00
Steve Harris
571757b2a6 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
Steve Harris
a150d8b90b 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: 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]
Former-commit-id: 571757b2a6
Former-commit-id: 64cf1aedb1
2013-06-06 15:46:23 -05:00
Ron Anderson
39e6673685 Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

Former-commit-id: d2418d309830a5063fcd90fd18a8d636574ddfbb
2013-06-05 12:05:15 -05:00
Ron Anderson
874c119d6c Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

Former-commit-id: 859b72a714 [formerly 39e6673685 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]
Former-commit-id: 39e6673685
Former-commit-id: 6bab5a5935
2013-06-05 12:05:15 -05:00
Nate Jensen
09ef61bc9e Issue #1638 fix mistakes
Change-Id: I7cf9d0393d8ac5ca7459a5ebfb7660e101ae0da5

Former-commit-id: f5a939794ed07e77c7df23a779ca61c272aa546c
2013-04-30 13:45:14 -05:00
Nate Jensen
d521b09fe1 Issue #1638 fix mistakes
Change-Id: I7cf9d0393d8ac5ca7459a5ebfb7660e101ae0da5

Former-commit-id: d476f02796 [formerly 09ef61bc9e [formerly f5a939794ed07e77c7df23a779ca61c272aa546c]]
Former-commit-id: 09ef61bc9e
Former-commit-id: b8adb51f15
2013-04-30 13:45:14 -05:00