David Friedman
ea1e9feb1d
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37ca2dfe8e8f6
2014-08-28 15:43:32 +00: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
Brian.Dyke
76bd6575b6
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: a24794ca7b47ae6015e5
2014-08-28 11:39:48 -04: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
Steve Harris
080a50d28c
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
...
Former-commit-id: d3b18900b3891019aadd
2014-08-27 11:34:06 -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
Daniel.Huffman
e2e132e7a5
ASM #16715 - Reverted and augmented Cities.xml
...
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: d1cd90b4878962a069be
2014-08-26 13:30:09 +00: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
Richard Peter
ab7facb903
Merge "Issue #3537 Fixed dirPattern in category Local." into omaha_14.2.4
...
Former-commit-id: 008a3e8f804ba39c5e56
2014-08-25 14:24:27 -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
Ron Anderson
03173a9fe7
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
...
Former-commit-id: 4285719a084e6bbb4be4
2014-08-25 14:04:41 -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
Brian Clements
960eb2dc29
Issue #3500 back port of loadConfig.py to fix gfe starup issue
...
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: cf671dcda84314f71387
2014-08-25 13:34:36 -05:00
Roger Ferrel
1ff321ce51
Issue #3537 Fixed dirPattern in category Local.
...
Former-commit-id: e451dd2814c7a6040792
2014-08-25 13:23:44 -05:00
Nate Jensen
0852d804ba
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
...
Former-commit-id: d66ac296405e46c55a76
2014-08-25 13:12:46 -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
Brian Clements
344ba01102
Omaha #2926 switched textdb to thrift client
...
Change-Id: I80a55506fa1e6d8780c0d3dbfb4b3c82b1aac9f1
Former-commit-id: c05e535cc81bbf5d7346
2014-08-25 10:28:48 -05:00
Steve Harris
8aadfe944a
Merge branch 'master_14.2.2' (14.2.2-29) into omaha_14.2.2
...
Former-commit-id: d850919303a03b5201cb
2014-08-25 08:19:50 -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
a841eb53e5
Merge branch 'master_14.2.4' into asm_14.2.4
...
Former-commit-id: 0fbc5269eaa4376ec79f
2014-08-22 16:40:51 -04: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
steve.naples
1bde9a4013
ASM #15664 Fixed issue with Tear Off menus not closing when perspective is closed, which caused an error.
...
Change-Id: If5fd120b7b34074686492d4cab9268ec1ac51a41
Former-commit-id: 7690281c5cc2bb43944c
2014-08-22 15:21:35 +00:00
Brian Clements
bcc3e405e5
Issue #3500 remove locking on osgi internals, rework gfe client startup
...
fixed error handling in loadConfig.py
added python to path in GfePyIncludeUtil
moved ProcedureXMLManager to overridable method in AbstractCaveComponent
Change-Id: Ie7dff55657ba216c47f7a56b3506cbed3a3f6ab2
Former-commit-id: 9f7905b58dd62db22874
2014-08-22 08:56:56 -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
