Brian Clements
|
eb84b255b0
|
Omaha #3573 fixed clean in collaboration dataserver ant script
Change-Id: I52d58a2c17b4f667cc2341a7e52380877aa6f74a
Former-commit-id: 23f1f7b2b6 [formerly d2bfe367c9753fc4a2db181c7966179a20713a02]
Former-commit-id: 9fe49043e7
|
2014-09-02 10:04:39 -05:00 |
|
Nate Jensen
|
9fe0e6df69
|
Merge "Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily" into omaha_14.4.1
Former-commit-id: 0ee832fc2f [formerly 0a6287431cbcc43ad6f42898a94d173fe451566e]
Former-commit-id: 625f0db18f
|
2014-08-28 11:30:45 -05:00 |
|
Nate Jensen
|
22f24dbb13
|
Merge "Omaha #3562 jetty upgrade change for dataserver" into omaha_14.4.1
Former-commit-id: e0d861461b [formerly 96882cbdc801c37e63ca0bc1ce950cbdffd97122]
Former-commit-id: c8c93dccf1
|
2014-08-28 11:23:43 -05:00 |
|
Ron Anderson
|
dc185b8dd1
|
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 2b88ade974 [formerly e7acedd733e4f1acc89f6287fe74ff116376a4ca]
Former-commit-id: bb1e80b844
|
2014-08-28 10:43:54 -05:00 |
|
Nate Jensen
|
fb0829fd4d
|
Merge "Omaha #3503 Composite product generators init after spring beans are loaded" into omaha_14.4.1
Former-commit-id: afe94aca08 [formerly 1eb554cd30d53daf44de42e0ddd3f35bf8f37bae]
Former-commit-id: de69231d3a
|
2014-08-28 10:40:50 -05:00 |
|
Nate Jensen
|
7bf0d7cd2a
|
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
Former-commit-id: 8536f6681a [formerly 2bac6ff5e600218f61343a7dc0f540c27f291924]
Former-commit-id: 2710aed225
|
2014-08-27 16:27:40 -05:00 |
|
Brian Clements
|
ab4eaee171
|
Omaha #3562 jetty upgrade change for dataserver
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 66da9e63b7 [formerly bb90464f68d562105809ef36f88869ff4570095c]
Former-commit-id: 3595bd2728
|
2014-08-27 13:18:13 -05:00 |
|
Nate Jensen
|
697e1c0b79
|
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
Former-commit-id: 7acf4a04b2 [formerly bdc7d4cb7873651a4b59e0b6af9bb9dae931de77]
Former-commit-id: 6fca563d21
|
2014-08-27 09:54:49 -05:00 |
|
Nate Jensen
|
0edb5fc46c
|
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
Former-commit-id: 1ad37de1ef [formerly 93e8fb3b1b27bdce2b15397e2ee7db6f1b419a05]
Former-commit-id: 2d1d18b2ff
|
2014-08-27 09:54:24 -05:00 |
|
Nate Jensen
|
2f0b209e10
|
Omaha #3132 fix compilation issue from merge
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: 3f7170f862 [formerly b45249baec6c6d4f77e5aeb23b910689df192c8a]
Former-commit-id: 0160955244
|
2014-08-26 18:22:26 -05:00 |
|
Brian Clements
|
a39a997a8d
|
Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: f871058f67 [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]
Former-commit-id: a609334abf
|
2014-08-26 17:22:20 -05:00 |
|
Brian Clements
|
5dc5530120
|
Omaha #3503 Composite product generators init after spring beans are loaded
Change-Id: I894adbc14e1bfe183a3f7717d95dba85291a2a09
Former-commit-id: b88f012e69 [formerly f6109e74ff5e26547c8fc03d7bb5ecde1046f689]
Former-commit-id: 095f84e71f
|
2014-08-26 17:12:34 -05:00 |
|
Nate Jensen
|
f84e89b694
|
Omaha #3356 configure path manager factory before spring initialization
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: fdc4cc60b9 [formerly 263452a82aef4756492fe02156525137b5ca09ff]
Former-commit-id: dbbf012a34
|
2014-08-26 16:45:00 -05:00 |
|
Steve Harris
|
8c5026314c
|
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: 038b284066 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]
Former-commit-id: 99ae9bdc10
|
2014-08-26 16:25:21 -05:00 |
|
Nate Jensen
|
41e6446b49
|
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
Former-commit-id: b92d94d19d [formerly d5db15de813a41767a1a10b0bfa07eb88c8dff6e]
Former-commit-id: 704ebac10a
|
2014-08-26 13:42:13 -05:00 |
|
Nate Jensen
|
e4df37dd05
|
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: 448887b913 [formerly 59c4919564db8f8ebf61fbac6ce2bdd29095479e]
Former-commit-id: 46fc72804a
|
2014-08-26 13:39:15 -05:00 |
|
Brian.Dyke
|
489fec4b25
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b3767167c7 [formerly 2382e17fb6b947be89649da7c25698dc5baf5bf4]
Former-commit-id: 86f0ed23c1
|
2014-08-26 13:31:34 -04:00 |
|
Nate Jensen
|
d2a653e277
|
Merge "Omaha #3541 fixed grid coverage spring" into omaha_14.4.1
Former-commit-id: 80ab7b8e53 [formerly 99211be9635e03e7ae117ff694912f7c58e7ab44]
Former-commit-id: 169f5729db
|
2014-08-26 11:34:38 -05:00 |
|
Max Schenkelberg
|
dacc10bcbc
|
Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env
Change-Id: I05abe29c7df0b22026547f2e89b5074281f1a7ea
Former-commit-id: 78b87b7a63 [formerly 3aff99e787a7368f40cdd161581ead2d3552118c]
Former-commit-id: 63967fbc78
|
2014-08-26 11:32:20 -05:00 |
|
Max Schenkelberg
|
ac67bd42b9
|
Omaha #3541 fixed grid coverage spring
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: df50024b63 [formerly f2a76dfda110e231539474bffbde123fbe6313c9]
Former-commit-id: f7620471da
|
2014-08-26 11:28:42 -05:00 |
|
Steve Harris
|
93f812cab6
|
Merge branch 'master_14.3.1' (c4e9d3f = 14.2.4 -> 14.3.1 'ours merge') into omaha_14.4.1
Former-commit-id: e3a6f7b58b [formerly 6306702a3bb6a58bfc7ef9a399d822950e8e9653]
Former-commit-id: e8ffa194af
|
2014-08-26 10:30:10 -05:00 |
|
Brian.Dyke
|
8ac44dfbd3
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 59bacf90ac [formerly b13e744dbbcc332b9efd0799e87390bdf9bb1df3]
Former-commit-id: de56ccebc0
|
2014-08-26 10:56:45 -04:00 |
|
Richard Peter
|
64683e5784
|
Omaha #3541 Fix request jvm startup and build
Change-Id: I6141ef1d74430fc43ea11f296c6ab95fc4276d6f
Former-commit-id: f478b42e61 [formerly 1c698d67a2c0ed3b11f910b593b1bbbdb2f46a86]
Former-commit-id: bf5f1c27a7
|
2014-08-25 21:21:04 -05:00 |
|
Richard Peter
|
64848acf9d
|
Merge "Omaha #3541 Updated A2 baseline to reflect request service split" into omaha_14.4.1
Former-commit-id: 651a10715a [formerly e2ed1054e382de6e3656fd9335dedc5af3692c17]
Former-commit-id: 5cce505b7f
|
2014-08-25 20:43:28 -05:00 |
|
Nate Jensen
|
bd8e79390b
|
Merge "Omaha #3368 fix deploy-install for developers without ohd repo" into omaha_14.4.1
Former-commit-id: e174537a36 [formerly c9da6960b2aad034570cfa866432c9a143de47f0]
Former-commit-id: 0017deea02
|
2014-08-25 16:20:41 -05:00 |
|
Ron Anderson
|
3ffadac038
|
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
Former-commit-id: 73fec5c36a [formerly 2cfb44f69025ba06e85a44e481bac1f88b851834]
Former-commit-id: 753b715493
|
2014-08-25 16:18:58 -05:00 |
|
Nate Jensen
|
db84f25bfd
|
Omaha #3368 fix deploy-install for developers without ohd repo
Change-Id: Ib1738ed5e11022f5fd154ea85b29019e7c290f65
Former-commit-id: d43f0589f7 [formerly e9d7e258c60d39ab0d043f1e1cdc0ebcaf998ccc]
Former-commit-id: 86f64337ff
|
2014-08-25 16:16:34 -05:00 |
|
Nate Jensen
|
76ca1815ad
|
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
Former-commit-id: 1a48a8190f [formerly 5a0ccfe4b1effb0946e6d542c492bff45d6a904b]
Former-commit-id: 2516c869d2
|
2014-08-25 14:14:47 -05:00 |
|
Mark Peters
|
c7486f3952
|
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 6634a2df01 [formerly 449f167ce1c30a595b4b673fc4d71658500e844d]
Former-commit-id: 7b37c4d188
|
2014-08-25 13:50:27 -05:00 |
|
Ron Anderson
|
56b553ad0d
|
Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job
Change-Id: Id759e14fcec25a68add1b65e9bf48d836ada14c0
Former-commit-id: 606e2b210c [formerly 6b6213fe5b0ca48045fa59136b72efdf46f7e3f1]
Former-commit-id: 8434195c57
|
2014-08-25 12:39:58 -05:00 |
|
Roger Ferrel
|
a610e0a34b
|
Omaha #3353 Changes to remove Geospatial data set generation off the UI thread.
Change-Id: I5213f627a97a27bdb92c4857eac4071c5450b790
Former-commit-id: d0779ef059 [formerly f16a8ff2c51c392957e13ef63423abe9f99b3301]
Former-commit-id: ca3a0595d2
|
2014-08-25 07:59:26 -05:00 |
|
Max Schenkelberg
|
88ea402947
|
Omaha #3541 Updated A2 baseline to reflect request service split
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: e90bdb6fce [formerly e6b16ea30563c0afdd48822e8efc9faabadef8f0]
Former-commit-id: 896e353950
|
2014-08-22 13:15:42 -05:00 |
|
Steve Harris
|
8c66e2b895
|
Omaha #3368 - removing cave/hydro
Former-commit-id: 9cda8755c6 [formerly a232972763ef0dcbccd5d83b3841498f1b77b7aa]
Former-commit-id: 794208a255
|
2014-08-22 13:08:32 -05:00 |
|
Richard Peter
|
4cebb22560
|
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: a9af2314d3 [formerly 31e9cb1cfc15d79b204d4d16c1f7afa614bb9ca2]
Former-commit-id: ce238544d1
|
2014-08-22 10:47:05 -05:00 |
|
Greg Armendariz
|
b19a61cd10
|
Merge "Omaha #3368 - Move ohd plugin to new repository" into omaha_14.4.1
Former-commit-id: b951f0e4eb [formerly 24376606c4974e3b22f120dac1c81a1752771ab1]
Former-commit-id: 6370aaba96
|
2014-08-22 08:06:13 -05:00 |
|
Richard Peter
|
5a35e873ac
|
Merge "Omaha #3528 - removed unused versions of ldm from the baseline" into omaha_14.4.1
Former-commit-id: fffa5f5294 [formerly 61a982c8624ab6e433692255109119ab9f74655c]
Former-commit-id: 7331754776
|
2014-08-21 18:10:00 -05:00 |
|
Brian.Dyke
|
7ac47f5f03
|
Merge branch 'master_14.2.4' into master_14.3.1
Former-commit-id: 412d44847c [formerly c4e9d3ff0cf7bd4f12c1a8d886b568eb7a8ff97a]
Former-commit-id: 88641b69f1
|
2014-08-21 15:49:49 -04:00 |
|
Greg Armendariz
|
21c849be33
|
Merge "Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install." into omaha_14.4.1
Former-commit-id: 014c5e7259 [formerly 25de1e3ac801c1630a46186cc9ed02a04c568837]
Former-commit-id: 4f5f3dea6f
|
2014-08-21 12:37:35 -05:00 |
|
Nate Jensen
|
a3b1d88af3
|
Merge "Omaha #1664 Fixed invalid thread access in several GFE dialogs" into omaha_14.4.1
Former-commit-id: 72ce7a78b2 [formerly e59e5c327a8ba0488092d8774ecf65fd6b298a5b]
Former-commit-id: b4a3d550b5
|
2014-08-21 11:26:59 -05:00 |
|
Richard Peter
|
399dd380e0
|
Merge "Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts." into omaha_14.4.1
Former-commit-id: b6b7c6e67e [formerly b2dba13e2c22cecf1afe70632106d4fcb5340829]
Former-commit-id: 92ed88ac90
|
2014-08-21 11:12:17 -05:00 |
|
Steve Harris
|
aec275dc31
|
Omaha #3368 - Move ohd plugin to new repository
Former-commit-id: 28e88dfe7e [formerly 56dfed379b0e41c435a3226c3f02b9bc5232b4fd]
Former-commit-id: 8c467a9fa5
|
2014-08-21 11:04:08 -05:00 |
|
Bryan Kowal
|
8cca8ef455
|
Omaha #3528 - removed unused versions of ldm from the baseline
Former-commit-id: 15457162e7 [formerly 6a627c05dfc4960c6ec71c95df308b145ff192c7]
Former-commit-id: 77fa6fcacb
|
2014-08-21 10:21:15 -05:00 |
|
Brian.Dyke
|
93be1a54c7
|
VLab Issue #3648 - Corrected NCEP additions for ESTOFS model -fix gribModels_NCEP-7.xml tag
Former-commit-id: ae5656ca46 [formerly 1b83b788aee082b489ce0fe5dc6d775e2f621e01]
Former-commit-id: 7b8fef0fa3
|
2014-08-21 11:07:02 -04:00 |
|
Nathan Bowler
|
f70776903c
|
Omaha #3393 Add request/response for RadarDataRecord. Remove broken RadarDao override. Convert a2_rad scripts.
Change-Id: Ie3ea761920c1ecec233e1fc586f3cbcd5914f1c6
Former-commit-id: 8fdc47855e [formerly 44ca6fb8a26cc9af7267ce635a200eb3c26ce9f8]
Former-commit-id: 2fcc25bb9b
|
2014-08-21 10:55:28 -04:00 |
|
Bryan Kowal
|
6d3611101e
|
Omaha #3544 - unpack the Linux 64-bit SWT jar file post-install.
Former-commit-id: 734e4bcc7b [formerly 75df4503184b6e41eb8075f64552aec30e112d12]
Former-commit-id: c93a830f59
|
2014-08-21 09:45:16 -05:00 |
|
Ron Anderson
|
a9d580647e
|
Omaha #1664 Fixed invalid thread access in several GFE dialogs
Change-Id: Ib40e6928c61a0f9e4f9fad9d8e7a06a66af292e3
Former-commit-id: bb124e7fa2 [formerly 93aa457f4918cd16edd21422819cda12af26250f]
Former-commit-id: 4178dac741
|
2014-08-21 09:25:14 -05:00 |
|
Ron Anderson
|
2cd98dcd89
|
Merge "Omaha #3549 fix spelling in exceptions" into omaha_14.4.1
Former-commit-id: 029d66274b [formerly 47531ae8a49c5d2c6900a4c557339b2b3f179802]
Former-commit-id: df66067c53
|
2014-08-21 08:44:49 -05:00 |
|
Nate Jensen
|
162c33aa6c
|
Omaha #3549 fix spelling in exceptions
Change-Id: I4f9689cd0311b2e257b0d2150a8ffb06028e1a13
Former-commit-id: 8c5802837e [formerly 6b301dfa92787488394a868c3fb28d0cea6fae3a]
Former-commit-id: 9ef69e115b
|
2014-08-20 13:28:03 -05:00 |
|
Benjamin Phillippe
|
defe9d1c42
|
Omaha #3509 Fixed XACML processing to work properly with DPA
Change-Id: I6b66cfe4217c8a9bc2dec1d7e97b7f5203b518fe
Former-commit-id: 02719e9f90 [formerly 4661d8ec3ed187b2ccf270a2acbcd55cc5ef359c]
Former-commit-id: 201962c6fc
|
2014-08-20 09:30:16 -05:00 |
|
Roger Ferrel
|
d76722987e
|
Issue #3439 Name change per suggestions in email.
Former-commit-id: f110ca1f3d [formerly 44c3b86c9dc0b978acc66c5f79255270ce0acb41]
Former-commit-id: fb54b80ed5
|
2014-08-19 16:41:06 -05:00 |
|