Nate Jensen
e673ed62bd
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
...
Former-commit-id: fe457e89a72c209af1fa
2014-09-02 09:53:25 -05:00
Nate Jensen
3efe4cf3b0
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: 13f1a5a8abc4333e030c
2014-09-02 09:52:38 -05:00
Richard Peter
5db143cd92
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
...
Former-commit-id: 40917b61186f66071eca
2014-09-02 09:23:58 -05:00
Mark Peters
86b9016338
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
...
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: 91f2b365a1097ce54969
2014-08-29 15:05:29 -05:00
Ron Anderson
f3f2ec8843
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: de490ea5828583386e5f
2014-08-29 12:04:52 -05:00
Nate Jensen
47261a4ac4
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
...
Former-commit-id: c60dfb889c16191b10ab
2014-08-29 11:16:16 -05:00
Steve Harris
f51ceee718
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
...
Former-commit-id: c49eabbb45aedf89c00b
2014-08-29 11:05:34 -05:00
Ron Anderson
89cde78ea6
Omaha #3561 Yet another attempt to fix combinations file updating
...
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 9f37d7914abd52b5a924
2014-08-29 10:45:54 -05:00
Steve Harris
bddf9c0f27
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: 5d58625abc793064063b
2014-08-29 10:17:52 -05:00
Nate Jensen
8f0bd2bb84
Merge "Omaha #3356 inject spatial query through spring" into omaha_14.4.1
...
Former-commit-id: 822f1a20b067d5cb52ae
2014-08-28 14:32:57 -05:00
Nate Jensen
baece22d79
Omaha #3356 inject spatial query through spring
...
Change-Id: I81700e53505e4e599f2d58dc6b8b9c059532811d
Former-commit-id: 8f226399f758c85c76ef
2014-08-28 11:46:25 -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: 0ee832fc2f625f0db18f
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: e0d861461bc8c93dccf1
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: 2b88ade974bb1e80b844
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: afe94aca08de69231d3a
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: 8536f6681a2710aed225
2014-08-27 16:27:40 -05:00
Roger Ferrel
0147449477
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
...
Former-commit-id: 9154ef60bbfa42c4069a
2014-08-27 15:06:52 -05:00
Brian Clements
ab4eaee171
Omaha #3562 jetty upgrade change for dataserver
...
Change-Id: I6c851ddcf9f41148ba4aea28532c5d2735d3b663
Former-commit-id: 66da9e63b73595bd2728
2014-08-27 13:18:13 -05:00
Brian.Dyke
a08db8d73d
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: aa83bf804fe654318431
2014-08-27 11:19:19 -04:00
Nate Jensen
697e1c0b79
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
...
Former-commit-id: 7acf4a04b26fca563d21
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: 1ad37de1ef2d1d18b2ff
2014-08-27 09:54:24 -05:00
Nate Jensen
2f0b209e10
Omaha #3132 fix compilation issue from merge
...
Change-Id: I76e189ff871c2ca8f99806e035abb07087626fba
Former-commit-id: 3f7170f8620160955244
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: f871058f67a609334abf
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: b88f012e69095f84e71f
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: fdc4cc60b9dbbf012a34
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: 038b28406699ae9bdc10
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: b92d94d19d704ebac10a
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: 448887b91346fc72804a
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: b3767167c786f0ed23c1
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: 80ab7b8e53169f5729db
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: 78b87b7a6363967fbc78
2014-08-26 11:32:20 -05:00
Max Schenkelberg
ac67bd42b9
Omaha #3541 fixed grid coverage spring
...
Change-Id: I6c69cbe530daee61127e05d7f94a0e2c92ebe2e7
Former-commit-id: df50024b63f7620471da
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: e3a6f7b58be8ffa194af
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: 59bacf90acde56ccebc0
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: f478b42e61bf5f1c27a7
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: 651a10715a5cce505b7f
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: e174537a360017deea02
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: 73fec5c36a753b715493
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: d43f0589f786f64337ff
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: 1a48a8190f2516c869d2
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: 6634a2df017b37c4d188
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: 606e2b210c8434195c57
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: d0779ef059ca3a0595d2
2014-08-25 07:59:26 -05:00
Brian.Dyke
2ddc920a4a
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: dd9d7133d9325887e605
2014-08-22 14:16:22 -04:00
Max Schenkelberg
88ea402947
Omaha #3541 Updated A2 baseline to reflect request service split
...
Change-Id: Iaa540397b6723a61841d93baf655be87701d9c93
Former-commit-id: e90bdb6fce896e353950
2014-08-22 13:15:42 -05:00
Brian.Dyke
5b2b0d2bd9
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
...
Former-commit-id: 94577a1626a830b6d94c
2014-08-22 14:13:48 -04:00
Steve Harris
8c66e2b895
Omaha #3368 - removing cave/hydro
...
Former-commit-id: 9cda8755c6794208a255
2014-08-22 13:08:32 -05:00
Richard Peter
4cebb22560
Issue #3534 Update ThreadBasedAppender to extend UnsychronizedAppenderBase.
...
Change-Id: I6b01acd59f7fde5e98dcfe1f1221f8725fc0540b
Former-commit-id: a9af2314d3ce238544d1
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: b951f0e4eb6370aaba96
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: fffa5f52947331754776
2014-08-21 18:10:00 -05:00
