Brian.Dyke
|
803ceadaec
|
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: 301f3094be [formerly 9abb02ea8a] [formerly 301f3094be [formerly 9abb02ea8a] [formerly 270d2b0ddb [formerly b209604e1f0d6e790980d0bc8f1760e38f448076]]]
Former-commit-id: 270d2b0ddb
Former-commit-id: bbe6ec4d50 [formerly 37aacfcb96]
Former-commit-id: b9daa26f7d
|
2014-08-04 13:10:13 -04:00 |
|
Nate Jensen
|
b54a9694ee
|
Issue #3337 disable logback packaging data in cave
Former-commit-id: 56363ffc4a [formerly c003d70168] [formerly 56363ffc4a [formerly c003d70168] [formerly 939fde1575 [formerly db10ba5a37dbe219110f4f902bf9257f2f220b3d]]]
Former-commit-id: 939fde1575
Former-commit-id: c421e2de75 [formerly a2cfcd8716]
Former-commit-id: 75ffabbcc2
|
2014-07-02 09:24:15 -05:00 |
|
Max Schenkelberg
|
c6cf08db73
|
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: 59434c8a60 [formerly a01a6d68d0] [formerly 59434c8a60 [formerly a01a6d68d0] [formerly cbf8b9249c [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: 39e1c4fa46 [formerly 654da3c0a2]
Former-commit-id: f509321134
|
2014-03-04 09:23:36 -06:00 |
|
Max Schenkelberg
|
d99c6b49e3
|
Issue #2620 Fixed manifest issues for baseline p2 export
Change-Id: I79d64a0ff17e1b0d39e7ea6e690463968b92b9c3
Former-commit-id: 1256748c42 [formerly 68aa666045] [formerly 1256748c42 [formerly 68aa666045] [formerly 87a6db7853 [formerly aaf90365b8855551b0cc22a8a95ae7e0b55f52ff]]]
Former-commit-id: 87a6db7853
Former-commit-id: 424f2282f0 [formerly 2574685291]
Former-commit-id: 9903335f77
|
2014-01-20 13:54:27 -06:00 |
|
Nate Jensen
|
f5de7040ac
|
Issue #2142 same logging behavior for ufstatus and eclipse internal status messages
Change-Id: Ia488e8dd82cc41114ee2b80ecdbf00c3d85f8aa7
Former-commit-id: e933ff43f4 [formerly 3101962858] [formerly e933ff43f4 [formerly 3101962858] [formerly e13700ac63 [formerly 25d258fc932799955ff66b76a11c979e6fa59543]]]
Former-commit-id: e13700ac63
Former-commit-id: ed1cad67f5 [formerly 31298d0543]
Former-commit-id: a12a848534
|
2013-08-27 18:33:24 -05:00 |
|
Nate Jensen
|
881ec9665e
|
Issue #2142 when logging internally, let loggers format message and stacktrace
Change-Id: I43bdbc6c96b7a57326fb652ed49e731ff0f90576
Former-commit-id: aa2336f598 [formerly d919e08791] [formerly aa2336f598 [formerly d919e08791] [formerly 6f8c9aea0d [formerly 2de8d8d887a50747abc5d2d020b65f5c12dd819c]]]
Former-commit-id: 6f8c9aea0d
Former-commit-id: 893cba29b1 [formerly c48c92477f]
Former-commit-id: 5763edfd08
|
2013-08-27 14:53:29 -05:00 |
|
Nate Jensen
|
2d838fd7b5
|
Issue #2142 fix cave logs of ufstatus messages on deployed systems
Change-Id: Ib873d34781953dd11b612a92602435a618e8f228
Former-commit-id: 6893790cc3 [formerly 4a2557405a] [formerly 6893790cc3 [formerly 4a2557405a] [formerly e06ab02275 [formerly 5b2fec7a5e94e9352ae53091e20257aa8ee7a3d6]]]
Former-commit-id: e06ab02275
Former-commit-id: 28d934146f [formerly 42924ab3c5]
Former-commit-id: 984a10b710
|
2013-08-26 12:28:31 -05:00 |
|
Max Schenkelberg
|
5167a52b65
|
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: b95a96f4c9 [formerly 0f3c791120] [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 4fdb3c8306 [formerly 75c95e83ef]
Former-commit-id: 2178fac70d
|
2013-08-09 14:24:49 -05:00 |
|
Nate Jensen
|
815087f84e
|
Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f
Former-commit-id: cce952c0bc [formerly a919490d00] [formerly cce952c0bc [formerly a919490d00] [formerly a9f5465c99 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]
Former-commit-id: a9f5465c99
Former-commit-id: 71a7b044ae [formerly fe3adecbc2]
Former-commit-id: 440756a331
|
2013-08-08 14:46:52 -05:00 |
|
Nate Jensen
|
d6cbe9b4f5
|
Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4
Former-commit-id: 8968389383 [formerly ec01e6e872] [formerly 8968389383 [formerly ec01e6e872] [formerly be9315642b [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]
Former-commit-id: be9315642b
Former-commit-id: 8cca3c32ac [formerly b0f3d536e4]
Former-commit-id: 9d4e00d5d1
|
2013-08-07 16:44:30 -05:00 |
|
Nate Jensen
|
2a28bb772b
|
Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1
Former-commit-id: 621a4da9b7 [formerly 81d9a28d53] [formerly 621a4da9b7 [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 5c123e60d8 [formerly 447ac6311d]
Former-commit-id: 6d8c46e6d6
|
2013-07-17 14:03:43 -05:00 |
|
Max Schenkelberg
|
5ba50b4476
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 94fa6f0e30 [formerly 63421a4819] [formerly 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: d1881ffa51 [formerly 1610826d2e]
Former-commit-id: a47f187f4f
|
2013-07-15 14:26:15 -05:00 |
|
Nate Jensen
|
86b096bc9b
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
|
2013-07-01 14:41:05 -05:00 |
|
Steve Harris
|
18fdb31920
|
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: 64cf1aedb1 [formerly 571757b2a6] [formerly 64cf1aedb1 [formerly 571757b2a6] [formerly 2327205cb7 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]]
Former-commit-id: 2327205cb7
Former-commit-id: 8b78f538d3 [formerly 035d74b348]
Former-commit-id: abfd0b9ead
|
2013-06-06 15:46:23 -05:00 |
|
Ron Anderson
|
764f1dbec6
|
Issue #2026 Improved alertviz error logging
Change-Id: Ia30086b9d830c6d950045ceab36bbe802d507ac8
Former-commit-id: 6bab5a5935 [formerly 39e6673685] [formerly 6bab5a5935 [formerly 39e6673685] [formerly 859b72a714 [formerly d2418d309830a5063fcd90fd18a8d636574ddfbb]]]
Former-commit-id: 859b72a714
Former-commit-id: b3f48138a0 [formerly 94cfb2dddf]
Former-commit-id: c0efa5b28f
|
2013-06-05 12:05:15 -05:00 |
|
Nate Jensen
|
fe0c27242c
|
Issue #1638 fix mistakes
Change-Id: I7cf9d0393d8ac5ca7459a5ebfb7660e101ae0da5
Former-commit-id: b8adb51f15 [formerly 09ef61bc9e] [formerly b8adb51f15 [formerly 09ef61bc9e] [formerly d476f02796 [formerly f5a939794ed07e77c7df23a779ca61c272aa546c]]]
Former-commit-id: d476f02796
Former-commit-id: 12d8d9b5f8 [formerly be479b1e65]
Former-commit-id: 2d1b296835
|
2013-04-30 13:45:14 -05:00 |
|
Max Schenkelberg
|
3ba217badb
|
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: 07ae94c499 [formerly ea26d0de84] [formerly 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]]
Former-commit-id: 126be0cfe5
Former-commit-id: 850c8995cc [formerly d20958ae92]
Former-commit-id: 34134b3c62
|
2013-03-22 10:54:44 -05:00 |
|
Max Schenkelberg
|
1073393fbb
|
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: 2611980ca4 [formerly 4ed4ef8d71] [formerly 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: 5617dfaa67 [formerly 6b1426dd34]
Former-commit-id: 453ac44050
|
2013-02-27 11:50:38 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steven Harris
|
2f855322f6
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
f61c5114e8
|
12.10.1-4 baseline
Former-commit-id: 9cd1f3ec0f [formerly 791ef6cedf] [formerly 9cd1f3ec0f [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]
Former-commit-id: 92cc2d8605
Former-commit-id: f641cdd4e0 [formerly b4d2a0e8dd]
Former-commit-id: 451459d8cb
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
a924a8347a
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|