Commit graph

72 commits

Author SHA1 Message Date
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse
Former-commit-id: 0b01029e68
2015-12-29 20:15:31 -07:00
Richard Peter
b59e0fd8e9 Omaha #4346 - Allow alertViz to load configuration from common_static
Change-Id: I121aa90f405f4c9deea7f9627bd2ed60f31a1a91

Former-commit-id: 37ca477204 [formerly 41fcc19791a1c6ba725ebe38b51d87f8e1c9af7c]
Former-commit-id: 963da59dd2
2015-05-20 16:28:56 -05:00
Roger Ferrel
d507ea3c20 Omaha #4346 Merge base xml files into base configuration.
Change-Id: I056a4e04cb20625408a7a3e117e0cb0babad4a0d

Former-commit-id: e5d09b40ec [formerly ed292bad0ffffd57fecae3e8d80f125fd948f903]
Former-commit-id: a26076f47c
2015-04-09 07:58:33 -05:00
Nate Jensen
7e101afc69 Omaha #4234 remove code that doesn't work anyway
Change-Id: I6747dcc1ccb3f7c3b424b996d63417f4a86a171b

Former-commit-id: f5e4751703 [formerly 26b21f4db52aa6dd802a5de460b98e1758bc6872]
Former-commit-id: 83d109e2cf
2015-03-18 11:50:10 -05:00
Roger Ferrel
5e9976c88b Omaha #4015 Clean up.
Former-commit-id: e9a4ee8baa [formerly cefbada02e207287fb26b1dd629270d591f86635]
Former-commit-id: f340c87441
2015-02-24 12:13:50 -06:00
Roger Ferrel
120de0e2ba Omaha #4015 Move redundant entries to logback include files for alertviz and edex.
Change-Id: I23c592a1c05eda309047e73d136a3e1092143611

Former-commit-id: d15abc2257 [formerly 6e840bc94847162ef66aab3ce961e6fa222801c5]
Former-commit-id: dd3d9708d7
2015-02-23 12:27:50 -06:00
Ben Steffensmeier
950075dc59 Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]
Former-commit-id: 1d2144e840
2014-09-02 15:39:45 -05:00
Ben Steffensmeier
26d4adc00b Omaha #3390 Remove references to deprecated API.
Former-commit-id: e32037b42a [formerly 950075dc59 [formerly 1d2144e840] [formerly e32037b42a [formerly ec7eeeb08af2cbad5d7880ae17ba7b351de23dc3]]]
Former-commit-id: 950075dc59 [formerly 1d2144e840]
Former-commit-id: 950075dc59
Former-commit-id: 59e6ec282f
2014-09-02 15:39:45 -05:00
Nate Jensen
7165ef7f12 Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
Former-commit-id: 5e8797ef77 [formerly 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae]
Former-commit-id: 04083235ad
2014-08-05 10:33:40 -05:00
Nate Jensen
8c6368ca47 Merge "Omaha #3356 remove unreferenced registered buddy policies" into omaha_14.4.1
Former-commit-id: 5e8797ef77 [formerly 7165ef7f12 [formerly 04083235ad] [formerly 5e8797ef77 [formerly 3b2a9a4d79bdf3fe4ce72ab342f035f7f58045ae]]]
Former-commit-id: 7165ef7f12 [formerly 04083235ad]
Former-commit-id: 7165ef7f12
Former-commit-id: 6f8270f014
2014-08-05 10:33:40 -05:00
Nate Jensen
69d1481634 Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

Former-commit-id: 7fb8a476f7 [formerly 9ff58fb62685fbb2f9322842ecdab40c78a8536e]
Former-commit-id: cc56bc4b3b
2014-08-05 09:27:10 -05:00
Nate Jensen
8df93d1499 Omaha #3356 remove unreferenced registered buddy policies
Change-Id: Ib3192d9da29129f5ed0db35ed903f33b111a8eb6

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

Former-commit-id: 857f1b70cc [formerly 41306351920aee44bdf2d9648616ddc8a4511632]
Former-commit-id: 06a64080e7
2014-08-04 12:30:55 -05:00
Nate Jensen
84762a24ac Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d

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

Former-commit-id: 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]
Former-commit-id: 68aa666045
2014-01-20 13:54:27 -06:00
Max Schenkelberg
259ef77ce4 Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3

Former-commit-id: 87a6db7853 [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 1256748c42 [formerly 68aa666045]
Former-commit-id: 1256748c42
Former-commit-id: 7073ea5e90
2014-01-20 13:54:27 -06:00
Nate Jensen
e933ff43f4 Issue #2142 same logging behavior for ufstatus and eclipse internal status messages
Change-Id: Ia488e8dd82cc41114ee2b80ecdbf00c3d85f8aa7

Former-commit-id: e13700ac63 [formerly 25d258fc932799955ff66b76a11c979e6fa59543]
Former-commit-id: 3101962858
2013-08-27 18:33:24 -05:00
Nate Jensen
1f24afa9b0 Issue #2142 same logging behavior for ufstatus and eclipse internal status messages
Change-Id: Ia488e8dd82cc41114ee2b80ecdbf00c3d85f8aa7

Former-commit-id: e13700ac63 [formerly e933ff43f4 [formerly 3101962858] [formerly e13700ac63 [formerly 25d258fc932799955ff66b76a11c979e6fa59543]]]
Former-commit-id: e933ff43f4 [formerly 3101962858]
Former-commit-id: e933ff43f4
Former-commit-id: 3a9373a893
2013-08-27 18:33:24 -05:00
Nate Jensen
aa2336f598 Issue #2142 when logging internally, let loggers format message and stacktrace
Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576

Former-commit-id: 6f8c9aea0d [formerly 2de8d8d887a50747abc5d2d020b65f5c12dd819c]
Former-commit-id: d919e08791
2013-08-27 14:53:29 -05:00
Nate Jensen
113ea847bd Issue #2142 when logging internally, let loggers format message and stacktrace
Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576

Former-commit-id: 6f8c9aea0d [formerly aa2336f598 [formerly d919e08791] [formerly 6f8c9aea0d [formerly 2de8d8d887a50747abc5d2d020b65f5c12dd819c]]]
Former-commit-id: aa2336f598 [formerly d919e08791]
Former-commit-id: aa2336f598
Former-commit-id: 62cf4798a3
2013-08-27 14:53:29 -05:00
Nate Jensen
6893790cc3 Issue #2142 fix cave logs of ufstatus messages on deployed systems
Change-Id: Ib873d34781953dd11b612a92602435a618e8f228

Former-commit-id: e06ab02275 [formerly 5b2fec7a5e94e9352ae53091e20257aa8ee7a3d6]
Former-commit-id: 4a2557405a
2013-08-26 12:28:31 -05:00
Nate Jensen
c79477c973 Issue #2142 fix cave logs of ufstatus messages on deployed systems
Change-Id: Ib873d34781953dd11b612a92602435a618e8f228

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

Former-commit-id: a9f5465c99 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]
Former-commit-id: a919490d00
2013-08-08 14:46:52 -05:00
Nate Jensen
9b9f26bcc5 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

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

Former-commit-id: be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]
Former-commit-id: ec01e6e872
2013-08-07 16:44:30 -05:00
Nate Jensen
c79b83981a Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

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

Former-commit-id: a0aeeedd23 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]
Former-commit-id: 81d9a28d53
2013-07-17 14:03:43 -05:00
Nate Jensen
9b0bb7deb5 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: a0aeeedd23 [formerly 621a4da9b7 [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]
Former-commit-id: 621a4da9b7 [formerly 81d9a28d53]
Former-commit-id: 621a4da9b7
Former-commit-id: 9c575f1754
2013-07-17 14:03:43 -05:00
Max Schenkelberg
94fa6f0e30 Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 63421a4819
2013-07-15 14:26:15 -05:00
Max Schenkelberg
5e50837d4c Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 94fa6f0e30 [formerly 63421a4819]
Former-commit-id: 94fa6f0e30
Former-commit-id: cd88054e2b
2013-07-15 14:26:15 -05:00
Nate Jensen
a4de603bcf Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]
Former-commit-id: 316d6c09c6
2013-07-01 14:41:05 -05:00
Nate Jensen
6412b49aa0 Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

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

Former-commit-id: 859b72a714 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]
Former-commit-id: 39e6673685
2013-06-05 12:05:15 -05:00
Ron Anderson
012d2fc60a Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8

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

Former-commit-id: d476f02796 [formerly f5a939794ed07e77c7df23a779ca61c272aa546c]
Former-commit-id: 09ef61bc9e
2013-04-30 13:45:14 -05:00
Nate Jensen
2122be7651 Issue #1638 fix mistakes
Change-Id: I7cf9d0393d8ac5ca7459a5ebfb7660e101ae0da5

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