Greg Armendariz
|
a38bb1fdd3
|
Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1
Former-commit-id: 964ad44a4d [formerly a9f6d3528c] [formerly 33b0ac3811] [formerly 964ad44a4d [formerly a9f6d3528c] [formerly 33b0ac3811] [formerly b229adbf38 [formerly 33b0ac3811 [formerly 2a4e26c1be0118f71e18a2c5bfa8777163a97d30]]]]
Former-commit-id: b229adbf38
Former-commit-id: 937866d9fc [formerly d63a9da4d6] [formerly 3425e01542aa3ace9515c5168fc3318fc6f9f911 [formerly edb50956c8]]
Former-commit-id: 22848ce1b68d7e8f411bd8a4e15a3940e1ef4a36 [formerly a2aa3fa6ff]
Former-commit-id: 8566996f06
|
2014-09-02 10:40:13 -05:00 |
|
Nate Jensen
|
817ef8e8db
|
Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
Former-commit-id: 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 8b646ba31d [formerly 3258b9a2b2] [formerly 5247f4833f] [formerly 653d594382 [formerly 5247f4833f [formerly e3c3d979ba7dcb46d2af716aa73e05c67f0dd2ba]]]]
Former-commit-id: 653d594382
Former-commit-id: 9fe09a5a4a [formerly 9067556a0e] [formerly 16cdf4e9bf10ff7dd7304857d8a8edd3a9887132 [formerly a63f5ee67b]]
Former-commit-id: a4957d53386d3437cf9be10914fe20459ec96bed [formerly 8078915092]
Former-commit-id: 0c55719688
|
2014-09-02 10:14:08 -05:00 |
|
Brian Clements
|
26bbbcafc6
|
Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 051344f98f [formerly eb84b255b0] [formerly 9fe49043e7] [formerly 051344f98f [formerly eb84b255b0] [formerly 9fe49043e7] [formerly 23f1f7b2b6 [formerly 9fe49043e7 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]]]]
Former-commit-id: 23f1f7b2b6
Former-commit-id: efa02bf1b0 [formerly 8da4a4ccf4] [formerly c7bdc30721b964ac4e5ff63f21d1f375ed5ec691 [formerly 7a29eef035]]
Former-commit-id: 73025c41236b9dc6b94fbb2a7c79208b8fbdb4bb [formerly e56c909c26]
Former-commit-id: 54a627e05a
|
2014-09-02 10:04:39 -05:00 |
|
Nate Jensen
|
55b8cace97
|
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
Former-commit-id: 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly 2d5df2705f [formerly e673ed62bd] [formerly 2c209af1fa] [formerly fe457e89a7 [formerly 2c209af1fa [formerly 09d7406f13949cf6a90164b06742c80ba2e18110]]]]
Former-commit-id: fe457e89a7
Former-commit-id: 23e2185306 [formerly 675bf92355] [formerly d45ff0db4fb7b24b0d0dac7dd89e774e93c37f76 [formerly 5661124038]]
Former-commit-id: d73ffe2ac6152190335275c8b09eca38523eb2c5 [formerly 84a107c8fa]
Former-commit-id: 070ef331b9
|
2014-09-02 09:53:25 -05:00 |
|
Nate Jensen
|
8fce75eb4c
|
Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
Former-commit-id: 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 9911f52bba [formerly 3efe4cf3b0] [formerly c4333e030c] [formerly 13f1a5a8ab [formerly c4333e030c [formerly 172d733902e6430de4f776eed3ad4cd6a94164a5]]]]
Former-commit-id: 13f1a5a8ab
Former-commit-id: 8ce67a74fc [formerly ce408af16d] [formerly d4c7add5b764b550d58d33f2f4196259ef2e45ee [formerly d7a2ff8336]]
Former-commit-id: eeef362c82e91dc32f6c0c742ffa9f5f3910e7e0 [formerly f913771eb0]
Former-commit-id: 037859fb38
|
2014-09-02 09:52:38 -05:00 |
|
Nate Jensen
|
11a7a988e0
|
Omaha #3356 fix cave startup
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly c77003fe38 [formerly 9bf9e3a658] [formerly 4395ab6f11] [formerly ef99d43451 [formerly 4395ab6f11 [formerly d326ee1a73a852e5534e76bf2148afd7646adb7e]]]]
Former-commit-id: ef99d43451
Former-commit-id: 52c35a13e4 [formerly b2d1d16230] [formerly 0df3a1960400546ca8de64d6de8790e6692bf51e [formerly fe789cce26]]
Former-commit-id: 125156870dc75ed8a982849f77f0d35a67186be9 [formerly 20aa52b2ed]
Former-commit-id: 9f908d764c
|
2014-09-02 09:50:08 -05:00 |
|
Richard Peter
|
ec4e085fbe
|
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
Former-commit-id: 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 7a17f81e58 [formerly 5db143cd92] [formerly 6f66071eca] [formerly 40917b6118 [formerly 6f66071eca [formerly f7aa38e6092e59e314fedad22829eed9e5c22ad2]]]]
Former-commit-id: 40917b6118
Former-commit-id: a464a6a8d4 [formerly 0f7e216834] [formerly 0aee5e24eab0cab12c41ad64d2f52c7f99e993be [formerly 59ad20bac3]]
Former-commit-id: 5d4edf0dcaa2380e6bf39a71eb3a7400382619b1 [formerly c1fcdcfde2]
Former-commit-id: 5496419cc9
|
2014-09-02 09:23:58 -05:00 |
|
Mark Peters
|
d1154bbe63
|
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly b906c8054b [formerly 86b9016338] [formerly 097ce54969] [formerly 91f2b365a1 [formerly 097ce54969 [formerly a0864eff6efa679cdc0f58cd408102e32145f22c]]]]
Former-commit-id: 91f2b365a1
Former-commit-id: adae10c2d0 [formerly abd256ab93] [formerly b7fb901b9427a42706a36a3d4c34c6103d17ca1a [formerly 54f9a37e6c]]
Former-commit-id: 7ce1fb859b9af8c7ab75518422673df67174e57b [formerly a3c382c0f7]
Former-commit-id: 9cab14d5b6
|
2014-08-29 15:05:29 -05:00 |
|
Ron Anderson
|
c317ab5eef
|
Omaha #3459 Ensure font is initialized before queryJob runs,
Additional refactoring to someday allow ZoneSelectorResource to use more common code.
Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062
Former-commit-id: 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly 0bb6076cdc [formerly f3f2ec8843] [formerly 8583386e5f] [formerly de490ea582 [formerly 8583386e5f [formerly a1896437f432bcb360365d28a0ee7377cec565af]]]]
Former-commit-id: de490ea582
Former-commit-id: 06dbcd69d6 [formerly ae69665e50] [formerly 39b07ee71f914fcb7284dbe4733a3b9645faf975 [formerly 338672c03f]]
Former-commit-id: e0bb2a385f25bd2eb5b08e0b6f5f02ee58b77b3c [formerly 3954787487]
Former-commit-id: 4a821c89b7
|
2014-08-29 12:04:52 -05:00 |
|
Nate Jensen
|
a14acec7da
|
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
Former-commit-id: 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly 1f087e5f0c [formerly 47261a4ac4] [formerly 16191b10ab] [formerly c60dfb889c [formerly 16191b10ab [formerly 3482282527df3ffd13c93d1a5d63d52ce79f8b2b]]]]
Former-commit-id: c60dfb889c
Former-commit-id: e994012d79 [formerly 6647ce3111] [formerly d6db0ba4036aa9711953caa0d0cd0c0456216e6e [formerly b61f93a2e4]]
Former-commit-id: bb0004636a214383e71c110406009e82fd42ff09 [formerly 08a9210cce]
Former-commit-id: 5e78fb700b
|
2014-08-29 11:16:16 -05:00 |
|
Steve Harris
|
d6571dcf19
|
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
Former-commit-id: 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly 12cd8db99b [formerly f51ceee718] [formerly aedf89c00b] [formerly c49eabbb45 [formerly aedf89c00b [formerly 94468f09bd626bd2ff26e7312ceede154f427664]]]]
Former-commit-id: c49eabbb45
Former-commit-id: 703098364e [formerly 113bcace66] [formerly a225c040ed3b1662d147a0f61eb11c429834a4a4 [formerly d24b29f7b2]]
Former-commit-id: e88047a01ace8ac3938d2a3d8316418ec4655cc7 [formerly aed5540042]
Former-commit-id: a7e18342d9
|
2014-08-29 11:05:34 -05:00 |
|
Ron Anderson
|
cb4ecaae1f
|
Omaha #3561 Yet another attempt to fix combinations file updating
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 30ef2a7667 [formerly 89cde78ea6] [formerly bd52b5a924] [formerly 9f37d7914a [formerly bd52b5a924 [formerly b1c067fe33d1fe09f89e981b03ef178bcc3a5f93]]]]
Former-commit-id: 9f37d7914a
Former-commit-id: d7f3e42548 [formerly b58479dc0b] [formerly 6362bc55a2ad3ebcea3f99623c5d126d5e3a486e [formerly b489928744]]
Former-commit-id: 7a0b93268eac3e1d8ed6c872ab795d04b56a0b9d [formerly 7158207736]
Former-commit-id: acc6079444
|
2014-08-29 10:45:54 -05:00 |
|
Steve Harris
|
3c8bfc8160
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 3619a11a8a [formerly bddf9c0f27] [formerly 793064063b] [formerly 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]]]
Former-commit-id: 5d58625abc
Former-commit-id: 10070d2762 [formerly 66b485c000] [formerly db0dcd3c8aec6653a2b81e49b72319049b73eb54 [formerly d984dd538f]]
Former-commit-id: ecf6e2073b4dd08f6ed165eae9b0647f2d0b9dc4 [formerly e681e0a457]
Former-commit-id: ecf26b3ac5
|
2014-08-29 10:17:52 -05:00 |
|
Nate Jensen
|
be47d6a454
|
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
Former-commit-id: dc6e307895 [formerly 8f0bd2bb84] [formerly 67d5cb52ae] [formerly dc6e307895 [formerly 8f0bd2bb84] [formerly 67d5cb52ae] [formerly 822f1a20b0 [formerly 67d5cb52ae [formerly afd5131062926a78942db59f35a5c2e719a542da]]]]
Former-commit-id: 822f1a20b0
Former-commit-id: 5d22759e9d [formerly 975f93d6cf] [formerly 0cf3789fe064185f8bdfb1456506f24980b4e4f4 [formerly 0a8312b09d]]
Former-commit-id: 988fbe5f0aef36ed0052fad8077ea02e6a7ba815 [formerly 1aa74a38d8]
Former-commit-id: 7e2f184332
|
2014-08-28 14:32:57 -05:00 |
|
Nate Jensen
|
f6b45f075d
|
Omaha #3356 inject spatial query through spring
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: c383a50c2c [formerly baece22d79] [formerly 58c85c76ef] [formerly c383a50c2c [formerly baece22d79] [formerly 58c85c76ef] [formerly 8f226399f7 [formerly 58c85c76ef [formerly 0b7ea786593f963ad1464c3426bcec7ac59914ae]]]]
Former-commit-id: 8f226399f7
Former-commit-id: fcc794c395 [formerly 244395af69] [formerly 8fb5e2190df56d7947f5fa01937f377db2b2b918 [formerly 9843865254]]
Former-commit-id: 1078ebed9c14b2f160ab76ef1d6cb10d34c627c0 [formerly 2b829dc66b]
Former-commit-id: fe0cd768ad
|
2014-08-28 11:46:25 -05:00 |
|
Nate Jensen
|
4f7f573aee
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 637dbddd2f [formerly 9fe0e6df69] [formerly 625f0db18f] [formerly 637dbddd2f [formerly 9fe0e6df69] [formerly 625f0db18f] [formerly 0ee832fc2f [formerly 625f0db18f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]]]]
Former-commit-id: 0ee832fc2f
Former-commit-id: 37b7936b7c [formerly 2a7cd5957d] [formerly d2c0d3d4439d68fab0f781b1b347ece53b4e57ad [formerly ce138b3e31]]
Former-commit-id: 76b6da7d01c1d7b06ed1902c25101c4523e98f84 [formerly 0e0cf3ba67]
Former-commit-id: 91ae999120
|
2014-08-28 11:30:45 -05:00 |
|
Nate Jensen
|
39407bd9e4
|
Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: 579881a4fe [formerly 22f24dbb13] [formerly c8c93dccf1] [formerly 579881a4fe [formerly 22f24dbb13] [formerly c8c93dccf1] [formerly e0d861461b [formerly c8c93dccf1 [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]]]]
Former-commit-id: e0d861461b
Former-commit-id: 4e49b2032e [formerly 16ee6e44a2] [formerly b2f37db95cc07754df8630ea19a398267bdd4e32 [formerly 1d3c307bd8]]
Former-commit-id: 9ee7ac2050f6b82493350fbedab2db1f6fd214ff [formerly 419437c6bd]
Former-commit-id: 5b03e9fa4a
|
2014-08-28 11:23:43 -05:00 |
|
Ron Anderson
|
7cc1ad7088
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 1e05b981fa [formerly dc185b8dd1] [formerly bb1e80b844] [formerly 2b88ade974 [formerly bb1e80b844 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]]]]
Former-commit-id: 2b88ade974
Former-commit-id: c6eb33afcc [formerly 39d00a72ce] [formerly 36188db03ab5afd51b2833d61639eaa10519a6f7 [formerly 0962c75d18]]
Former-commit-id: 86f00e159c29c3c94d7aa9fffb6a0183327a64c0 [formerly 56b56ea4f3]
Former-commit-id: 932d9e2783
|
2014-08-28 10:43:54 -05:00 |
|
Nate Jensen
|
921ff430f2
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: b036c5b851 [formerly fb0829fd4d] [formerly de69231d3a] [formerly b036c5b851 [formerly fb0829fd4d] [formerly de69231d3a] [formerly afe94aca08 [formerly de69231d3a [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]]]]
Former-commit-id: afe94aca08
Former-commit-id: fc25b7f583 [formerly da6259a198] [formerly e28bfa9a0c5522e752aaeb4c6e11382a37536cf8 [formerly 8952d15b12]]
Former-commit-id: 67f566ba56399bcd07518bba90cd28fae82f4abc [formerly f3454a7941]
Former-commit-id: 2db6fa9583
|
2014-08-28 10:40:50 -05:00 |
|
Nate Jensen
|
3876f26da7
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 7221b94904 [formerly 7bf0d7cd2a] [formerly 2710aed225] [formerly 8536f6681a [formerly 2710aed225 [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]]]]
Former-commit-id: 8536f6681a
Former-commit-id: b43a6418c7 [formerly f5810478ef] [formerly 10bd606cc6bf2a29f554ff34922524754debf4cf [formerly 3ddebb2170]]
Former-commit-id: 508ea1dcd7bc0ca2f7c09a313763aafa791fb985 [formerly 288db1aea0]
Former-commit-id: 94cf9816c7
|
2014-08-27 16:27:40 -05:00 |
|
Roger Ferrel
|
1b663590b4
|
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
Former-commit-id: 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 2944c3770f [formerly 0147449477] [formerly fa42c4069a] [formerly 9154ef60bb [formerly fa42c4069a [formerly 474e07b299246aee4e6b214226c176c4a10aa866]]]]
Former-commit-id: 9154ef60bb
Former-commit-id: db74982258 [formerly 17a8bd795d] [formerly 9c8c9bee1d8c31a829aaaca5968d61664e6d90fe [formerly 63a1b2890b]]
Former-commit-id: 5974e03bca22ea6311652bc9faaa322fe570944a [formerly 6e695a12d1]
Former-commit-id: 87b0200274
|
2014-08-27 15:06:52 -05:00 |
|
Brian Clements
|
8df5ce6b51
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 78e961b8f5 [formerly ab4eaee171] [formerly 3595bd2728] [formerly 78e961b8f5 [formerly ab4eaee171] [formerly 3595bd2728] [formerly 66da9e63b7 [formerly 3595bd2728 [formerly bb90464f68d562105809ef36f88869ff4570095c]]]]
Former-commit-id: 66da9e63b7
Former-commit-id: c6644cbe46 [formerly aa4dc98be0] [formerly dfcfb1b1cb51f20136796b65cef53843ab441829 [formerly 3efcaa6a8e]]
Former-commit-id: 9192075886511cdbd6d226a5edab1da735fd7fc9 [formerly 7a990efc0c]
Former-commit-id: 0efea299ab
|
2014-08-27 13:18:13 -05:00 |
|
Brian.Dyke
|
2da6c7b93b
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly 0a5ddf7457 [formerly a08db8d73d] [formerly e654318431] [formerly aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]]]
Former-commit-id: aa83bf804f
Former-commit-id: 4a56b6f6e1 [formerly f90649d7e7] [formerly c580412a81e899b2803a785d3de77c4ea7ca97b3 [formerly f7f16ff9eb]]
Former-commit-id: 2b5f667a78842762d60c8ab0ba442f22b9229095 [formerly c0dc594eda]
Former-commit-id: 7e4ab705cc
|
2014-08-27 11:19:19 -04:00 |
|
Nate Jensen
|
f63011dc93
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 6a20d84a8a [formerly 697e1c0b79] [formerly 6fca563d21] [formerly 7acf4a04b2 [formerly 6fca563d21 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]]]]
Former-commit-id: 7acf4a04b2
Former-commit-id: 1f9c98e8c4 [formerly 783a805a8a] [formerly 1343844853810696ccafe2e8795d21ef1b7f8773 [formerly ff03dc5783]]
Former-commit-id: d1035c455860cde4dc794860a8608b437f23c688 [formerly 60b0b76d42]
Former-commit-id: ba9c46532e
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
cac6498b0f
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ea041a01e [formerly 0edb5fc46c] [formerly 2d1d18b2ff] [formerly 1ad37de1ef [formerly 2d1d18b2ff [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]]]]
Former-commit-id: 1ad37de1ef
Former-commit-id: b1f76d8b6d [formerly dc09d337f2] [formerly 39d951ec78dac285126b4df9a10e17fcf4d51d7c [formerly 571ae1d09e]]
Former-commit-id: 13aaf18bc8f110c0e6efa2fd45f405582d1ff00a [formerly 376670d221]
Former-commit-id: a739387842
|
2014-08-27 09:54:24 -05:00 |
|
Nate Jensen
|
e9d2de9c48
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: a70df06392 [formerly 2f0b209e10] [formerly 0160955244] [formerly a70df06392 [formerly 2f0b209e10] [formerly 0160955244] [formerly 3f7170f862 [formerly 0160955244 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]]]]
Former-commit-id: 3f7170f862
Former-commit-id: c508bb668c [formerly 66c0933713] [formerly fc3a206bb36805ff0ce8c40da5b9af5501e60372 [formerly 281f360487]]
Former-commit-id: 735a41226d8d651ce153b2fe62599a50ad374487 [formerly 909bc9c412]
Former-commit-id: 728da699ad
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
392cfad0e2
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly 9509568efa [formerly a39a997a8d] [formerly a609334abf] [formerly f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]]]
Former-commit-id: f871058f67
Former-commit-id: 3061205a6b [formerly f179d62459] [formerly 28575adbedc1689f7fc46cd5d53fb04c3af8bd28 [formerly e02be806d0]]
Former-commit-id: 3cb76351d8871b831667f7940cd204584bb11974 [formerly aa0cdd843c]
Former-commit-id: fcb9de6bf4
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
6948aec9cd
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: 11fa1b962c [formerly 5dc5530120] [formerly 095f84e71f] [formerly 11fa1b962c [formerly 5dc5530120] [formerly 095f84e71f] [formerly b88f012e69 [formerly 095f84e71f [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]]]]
Former-commit-id: b88f012e69
Former-commit-id: 2540fa9a95 [formerly f29fb0a656] [formerly f52e0674ecdaac7e697e849aef805d1954d0f156 [formerly e6b2143a6b]]
Former-commit-id: 2b18d20744bbddd9a580553d65302bd310fc36a0 [formerly 237bdc0e2a]
Former-commit-id: a08ebbe0c7
|
2014-08-26 17:12:34 -05:00 |
|
Nate Jensen
|
5e714459ca
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly 4a48867a81 [formerly f84e89b694] [formerly dbbf012a34] [formerly fdc4cc60b9 [formerly dbbf012a34 [formerly 263452a82aef4756492fe02156525137b5ca09ff]]]]
Former-commit-id: fdc4cc60b9
Former-commit-id: 5690db1e94 [formerly 85a17ed23f] [formerly ec90e4ec5b78799ff8c90c5659475672966cd75e [formerly 70216d11e4]]
Former-commit-id: ca13b3031bbdcc900e3e1367503501855ce76f87 [formerly cf2e6693ed]
Former-commit-id: ac5a4234cb
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
146dc3aec7
|
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]
Former-commit-id: 038b284066
Former-commit-id: 00b3ad8eb6 [formerly 1da31a86dc] [formerly c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]]
Former-commit-id: c07303fea0c9c3e107dabbeefbd395be90d9018f [formerly 84edac842e]
Former-commit-id: 9d263bc542
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
54a6cbb8d9
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly bb4552ee2a [formerly 41e6446b49] [formerly 704ebac10a] [formerly b92d94d19d [formerly 704ebac10a [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]]]]
Former-commit-id: b92d94d19d
Former-commit-id: 8d0581a66d [formerly 0eea7a1105] [formerly 3efaa74664a741826024a3da6466b18e7749417f [formerly 08a3bcd85e]]
Former-commit-id: b4b5c391fc7f4c698dc46a1605859a8efe51d29f [formerly 0e17b3331e]
Former-commit-id: c107a88f8c
|
2014-08-26 13:42:13 -05:00 |
|
Nate Jensen
|
a96eca2d29
|
Merge "Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env" into omaha_14.4.1
Former-commit-id: 9060f82413 [formerly e4df37dd05] [formerly 46fc72804a] [formerly 9060f82413 [formerly e4df37dd05] [formerly 46fc72804a] [formerly 448887b913 [formerly 46fc72804a [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]]]]
Former-commit-id: 448887b913
Former-commit-id: ef810f2d9e [formerly ac814cc6c9] [formerly 321a097fc9e5a18ceee0ca4fe7a03aed77dead94 [formerly 88ac1c057c]]
Former-commit-id: 43b335a6aafd4eb481385999fce7db1ccabc7ca3 [formerly 6c93e01bda]
Former-commit-id: 10980c927d
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
bcdb3d4c19
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly acc3321457 [formerly 489fec4b25] [formerly 86f0ed23c1] [formerly b3767167c7 [formerly 86f0ed23c1 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]]]]
Former-commit-id: b3767167c7
Former-commit-id: ef2afe4f88 [formerly 1b9a28cc62] [formerly dfa43aa5c4d4a07843b46cd3b23eed8a26739086 [formerly f2b9203001]]
Former-commit-id: ab64fc858eafb7e5c8697e4fe618a1b8621ed5d0 [formerly 677ce2fb94]
Former-commit-id: 16dc3b41de
|
2014-08-26 13:31:34 -04:00 |
|
Nate Jensen
|
edda20d34a
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: 1b5cb51b4b [formerly d2a653e277] [formerly 169f5729db] [formerly 1b5cb51b4b [formerly d2a653e277] [formerly 169f5729db] [formerly 80ab7b8e53 [formerly 169f5729db [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]]]]
Former-commit-id: 80ab7b8e53
Former-commit-id: 1e4b11b2ee [formerly f3d6d3b90c] [formerly b0ca763e35be6d15c9ee8f28defa248af0c3c7a1 [formerly b51a4ffee6]]
Former-commit-id: 720c2975c0d0c10a1119d8b28a4809914ab2a63b [formerly a2784d994f]
Former-commit-id: 411825af28
|
2014-08-26 11:34:38 -05:00 |
|
Max Schenkelberg
|
8d3657ed54
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: d9536b7161 [formerly dacc10bcbc] [formerly 63967fbc78] [formerly d9536b7161 [formerly dacc10bcbc] [formerly 63967fbc78] [formerly 78b87b7a63 [formerly 63967fbc78 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]]]]
Former-commit-id: 78b87b7a63
Former-commit-id: 8b2b1013da [formerly 0a7a2fadec] [formerly 69cfa06cf3110cf0b0a3f06464a492b6de6bcd56 [formerly 7cfc26d1d7]]
Former-commit-id: 72bd8b39877326d1d084f39ad3ad4a274f7c39de [formerly 9048064741]
Former-commit-id: 0368097265
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
dab59fed84
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: 4b23f802ba [formerly ac67bd42b9] [formerly f7620471da] [formerly 4b23f802ba [formerly ac67bd42b9] [formerly f7620471da] [formerly df50024b63 [formerly f7620471da [formerly f2a76dfda110e231539474bffbde123fbe6313c9]]]]
Former-commit-id: df50024b63
Former-commit-id: 929fe3f461 [formerly 87e1c1a257] [formerly ac6ae681f3cb5b8dfaa6cf752f341c7d25e7a784 [formerly 6aff7b7a4c]]
Former-commit-id: 27c5e28c63d0587f2b277681844df9e3f1acf599 [formerly 47f4520d7c]
Former-commit-id: 2b110b1141
|
2014-08-26 11:28:42 -05:00 |
|
Steve Harris
|
cb8fb39f49
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: 6113923c73 [formerly 93f812cab6] [formerly e8ffa194af] [formerly 6113923c73 [formerly 93f812cab6] [formerly e8ffa194af] [formerly e3a6f7b58b [formerly e8ffa194af [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]]]]
Former-commit-id: e3a6f7b58b
Former-commit-id: 9d404d99c5 [formerly 727aafe498] [formerly 9c97c3a4e87b80dfd88f7b932b704b6d4c10dee7 [formerly a4c38663f8]]
Former-commit-id: 79358cfb8766b38fc120c3009a7b4ff64a697c4c [formerly 4e6bb7670e]
Former-commit-id: 868067baa1
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
eb989298c3
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly b99d31c7e6 [formerly 8ac44dfbd3] [formerly de56ccebc0] [formerly 59bacf90ac [formerly de56ccebc0 [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]]]]
Former-commit-id: 59bacf90ac
Former-commit-id: c2b8aa9023 [formerly dc14c2e6ce] [formerly 1aa12a57a91c266d9cae0f47f1830ad807f2a1d0 [formerly 8c803e81d3]]
Former-commit-id: d248a5cd3c84f91c9c7def176fde5802665acfbc [formerly c08a724cf0]
Former-commit-id: 6c1e526daf
|
2014-08-26 10:56:45 -04:00 |
|
Richard Peter
|
f3e79fbd6f
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: eeb9dd1a0e [formerly 64683e5784] [formerly bf5f1c27a7] [formerly eeb9dd1a0e [formerly 64683e5784] [formerly bf5f1c27a7] [formerly f478b42e61 [formerly bf5f1c27a7 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]]]]
Former-commit-id: f478b42e61
Former-commit-id: cc964bbb16 [formerly 832bd8d5e7] [formerly 568786a138efec77effe0e633ede4a9ebea149c7 [formerly ef45928158]]
Former-commit-id: 8d4d356508cafe54bb42446d9560c53d32e1de74 [formerly 820fb0085e]
Former-commit-id: 7964c0697d
|
2014-08-25 21:21:04 -05:00 |
|
Richard Peter
|
028aac838f
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: c1f0cfdcc0 [formerly 64848acf9d] [formerly 5cce505b7f] [formerly c1f0cfdcc0 [formerly 64848acf9d] [formerly 5cce505b7f] [formerly 651a10715a [formerly 5cce505b7f [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]]]]
Former-commit-id: 651a10715a
Former-commit-id: 8156239a5d [formerly 0992358153] [formerly 1468621a0d8c9d41a9402e27a2253c61db3b31cf [formerly eafe010aa1]]
Former-commit-id: de8b93ba75ee1bdae448adb782a9fa135eff4f41 [formerly ac192a5d86]
Former-commit-id: 147856f43d
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
b1b63781fc
|
Merge "Omaha #3368 fix deploy-install for developers without ohd repo" into omaha_14.4.1
Former-commit-id: 6566e3e75c [formerly bd8e79390b] [formerly 0017deea02] [formerly 6566e3e75c [formerly bd8e79390b] [formerly 0017deea02] [formerly e174537a36 [formerly 0017deea02 [formerly c9da6960b2aad034570cfa866432c9a143de47f0]]]]
Former-commit-id: e174537a36
Former-commit-id: 5331b1d594 [formerly 0cf41c2936] [formerly 83766c6475a78ce8f91f5c4793c79b6b653d2e36 [formerly fb52eb1083]]
Former-commit-id: 41dc4898576cfc866dd116c84f569f4bcb39df3a [formerly aeda9ad52d]
Former-commit-id: f42edfddbd
|
2014-08-25 16:20:41 -05:00 |
|
Ron Anderson
|
b9e30e763e
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 8ac2010d4b [formerly 3ffadac038] [formerly 753b715493] [formerly 73fec5c36a [formerly 753b715493 [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]]]]
Former-commit-id: 73fec5c36a
Former-commit-id: 2b0d089159 [formerly 0ee02920ec] [formerly b43d8ff03fa7f849326b6b4c9e8f7f4d9dc9e336 [formerly eabf14a6fe]]
Former-commit-id: 491d492fa4a915cabddd8a0f0de16ff2e0a90882 [formerly 01dcd5de10]
Former-commit-id: 0d75ae75e3
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
8e1b968959
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: e3244ce993 [formerly db84f25bfd] [formerly 86f64337ff] [formerly e3244ce993 [formerly db84f25bfd] [formerly 86f64337ff] [formerly d43f0589f7 [formerly 86f64337ff [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]]]]
Former-commit-id: d43f0589f7
Former-commit-id: 1be8735d1b [formerly d4f3d09f11] [formerly ed5ad972dec2dba196ff6ea2e0d3138e9c949ca8 [formerly aed159a1e2]]
Former-commit-id: 232fe10cbbb29a00c518ffea135b21c5e4584bc1 [formerly abec6e86d9]
Former-commit-id: cbd7d00d1f
|
2014-08-25 16:16:34 -05:00 |
|
Nate Jensen
|
90b1e0e9aa
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 2b15b6587e [formerly 76ca1815ad] [formerly 2516c869d2] [formerly 1a48a8190f [formerly 2516c869d2 [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]]]]
Former-commit-id: 1a48a8190f
Former-commit-id: 0c29cd1459 [formerly 2c09a51125] [formerly 384de854114c5b7d5c6b0092155676b848520f53 [formerly 85ececab93]]
Former-commit-id: a5fb452d823fa52df2cf390630ecc21a79fecbe8 [formerly 3ece89083f]
Former-commit-id: 626417bde9
|
2014-08-25 14:14:47 -05:00 |
|
Mark Peters
|
c71622cbb3
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 90833244de [formerly c7486f3952] [formerly 7b37c4d188] [formerly 6634a2df01 [formerly 7b37c4d188 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]]]]
Former-commit-id: 6634a2df01
Former-commit-id: 798c0a374b [formerly 1c0e5a7d35] [formerly b6372971169a46ceee886eb93b197f2eb2a02307 [formerly f1d31723c7]]
Former-commit-id: e7787f8d6c35139134890b743646bc30777cf924 [formerly c069dd338a]
Former-commit-id: 2d9e8e0553
|
2014-08-25 13:50:27 -05:00 |
|
Ron Anderson
|
e41ef00e62
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 0cb234d764 [formerly 56b553ad0d] [formerly 8434195c57] [formerly 606e2b210c [formerly 8434195c57 [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]]]]
Former-commit-id: 606e2b210c
Former-commit-id: 512225160f [formerly 6c38d4f143] [formerly 7aabd59d0a6ed65868fcbace30e4217e4eef4d03 [formerly fda5c981f9]]
Former-commit-id: b36a094dd01554e3be1ec138023a4f1a30ab5895 [formerly 7799092b08]
Former-commit-id: eede0b99c3
|
2014-08-25 12:39:58 -05:00 |
|
Roger Ferrel
|
b3d2996e76
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly 20362833cf [formerly a610e0a34b] [formerly ca3a0595d2] [formerly d0779ef059 [formerly ca3a0595d2 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]]]]
Former-commit-id: d0779ef059
Former-commit-id: 248bd0a393 [formerly be7d387a4b] [formerly 1fd4b3451da3ccea875b5e6dc43fa6eacddc8994 [formerly cfe1212590]]
Former-commit-id: 745fe2a291852f43240cb02cd4c30d6024a6d7fa [formerly a9d8c8f3f5]
Former-commit-id: c534338504
|
2014-08-25 07:59:26 -05:00 |
|
Brian.Dyke
|
272905b186
|
Merge branch 'master_14.2.2' into master_14.2.4 CM-MERGE:14.2.2-25-29 into 14.2.4
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
Former-commit-id: 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly 6402cb7d89 [formerly 2ddc920a4a] [formerly 325887e605] [formerly dd9d7133d9 [formerly 325887e605 [formerly 65e2373d13c7d5b33d579b87d98a8265252ea391]]]]
Former-commit-id: dd9d7133d9
Former-commit-id: e348a6abc7 [formerly c8e9153884] [formerly 7dbc20e2697aab4991870bf8493b74b08acbe56b [formerly 1839b614df]]
Former-commit-id: 85ccff40908964b07fef1c572de049c609434728 [formerly cd1b914f50]
Former-commit-id: 27372f098c
|
2014-08-22 14:16:22 -04:00 |
|
Max Schenkelberg
|
3fe9b3a357
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly 0419aeea52 [formerly 88ea402947] [formerly 896e353950] [formerly e90bdb6fce [formerly 896e353950 [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]]]]
Former-commit-id: e90bdb6fce
Former-commit-id: 9da9d7fe27 [formerly ee4d9a965c] [formerly 2cd1dab291464f00d51c5d42351d92f81defb05b [formerly 68221174c4]]
Former-commit-id: e6903f6858697e0f9f7137372b3aac308d58ed18 [formerly e864d8a275]
Former-commit-id: 395dcaa255
|
2014-08-22 13:15:42 -05:00 |
|
Brian.Dyke
|
348b4c12e9
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 64effd458c [formerly 5b2b0d2bd9] [formerly a830b6d94c] [formerly 94577a1626 [formerly a830b6d94c [formerly b2674ef57183706feb2bb17175d730bb2e213281]]]]
Former-commit-id: 94577a1626
Former-commit-id: 9c119c8431 [formerly 0cbbceb7e3] [formerly 5ebef4a85e30ac73432bcaf6ac7df852b8d06f7e [formerly a0af10ff2e]]
Former-commit-id: 522edbdb9ffeff69b90b3db092cedb88b93eea4b [formerly d0a2060e84]
Former-commit-id: 5a878760f1
|
2014-08-22 14:13:48 -04:00 |
|