Steve Harris
e8e7e88400
Merge branch 'master_14.3.1' (14.3.1-6) into omaha_14.3.1
...
Former-commit-id: b059918699
[formerly 7dc84f4c74
[formerly 36b00a413b977ef5e11a46cf6f3d575e39ee4b57]]
Former-commit-id: 7dc84f4c74
Former-commit-id: 31711d4c5a
2014-05-23 08:09:39 -05:00
Nate Jensen
056a32b760
Merge "Omaha #3093 add usage to hprof tool and standardize outputting size of things." into omaha_14.4.1
...
Former-commit-id: 6672ada43c
[formerly e800d85924
[formerly 6d6831bf3f4c3190d933521887c9953202618ace]]
Former-commit-id: e800d85924
Former-commit-id: dd3fd33cd6
2014-05-22 18:11:19 -05:00
Nate Jensen
571488a184
Merge "Omaha #2913 remove some more unused uengine code." into omaha_14.4.1
...
Former-commit-id: 349123ba05
[formerly add26fa7e9
[formerly 3562300cb46d196f754c37516dd39e9bb81ea254]]
Former-commit-id: add26fa7e9
Former-commit-id: f873b97ed0
2014-05-22 18:10:10 -05:00
Ben Steffensmeier
45b8a26306
Omaha #2913 remove some more unused uengine code.
...
Former-commit-id: 05e8d862c2
[formerly be301d1dc3
[formerly 9b72d2a1ddd7db5e06abee5bd172f700ad4c1277]]
Former-commit-id: be301d1dc3
Former-commit-id: 33c6867b52
2014-05-22 17:50:16 -05:00
Steve Harris
1052f868c7
Merge branch 'omaha_14.3.1' into omaha_14.4.1 - fixing geotools (goes in ufcore-foss)
...
Former-commit-id: 50009be04a
[formerly b7cbbaa56a
[formerly dbb188d0563c680f57f1917dbfae2d9515a6c412]]
Former-commit-id: b7cbbaa56a
Former-commit-id: eb924a1c47
2014-05-22 17:27:23 -05:00
Nate Jensen
578f6db26e
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: b67bf1e492
[formerly 8f6dcfaa1b
[formerly 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d]]
Former-commit-id: 8f6dcfaa1b
Former-commit-id: 730831d465
2014-05-22 16:46:50 -05:00
Ben Steffensmeier
d26fc4e108
Omaha #3093 add usage to hprof tool and standardize outputting size of things.
...
Former-commit-id: edd27c14cd
[formerly c5abcecc61
[formerly 7fd433be3f94ac37e644d12623af36bf4092ab3c]]
Former-commit-id: c5abcecc61
Former-commit-id: eac412d380
2014-05-22 15:56:34 -05:00
Steve Harris
f79a449b6b
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: b6af2db9f5
[formerly 518822ed83
[formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]
Former-commit-id: 518822ed83
Former-commit-id: 376482d3b1
2014-05-22 14:31:06 -05:00
Brian Clements
8471e4d8a4
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c875f17719
[formerly f9de79465a
[formerly c042671ecf12a6fa46e35d4954d23492f35b7c76]]
Former-commit-id: f9de79465a
Former-commit-id: 0a2ddfbc79
2014-05-22 14:09:07 -05:00
Steve Harris
74c5b0454c
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: 2059fc9c0e
[formerly 4899c4f56a
[formerly eae5c3e75061566e40194730c2cfb2003d952e62]]
Former-commit-id: 4899c4f56a
Former-commit-id: 0a3b23d055
2014-05-22 14:05:06 -05:00
Stephen Gilbert
7c9b12df92
VLab Issue #3720 - NCEP EDEX and EDEX Common delivery for 14.3.1
...
Removed dependency on persistCamelRegistered from ncgrib spring config
Change-Id: I84e7b6fc6e50f9d1795e887a9fb30f9cdda3a7f8
Former-commit-id: 4299e7c72c
[formerly 3b8233dd88
[formerly a7140f38a54a577dd2d62cc551ab182b561f6fc0]]
Former-commit-id: 3b8233dd88
Former-commit-id: 0dff405bc4
2014-05-22 14:35:49 -04:00
Stephen Gilbert
834c0bf1bb
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Former-commit-id: e73836f3b5
[formerly 8a3ab16e46
[formerly d2d54ee2bfbbe6fef44df58d2edc3b5858ffbe22]]
Former-commit-id: 8a3ab16e46
Former-commit-id: 651f6a2e9c
2014-05-22 13:31:12 -04:00
Nate Jensen
4d7f4a29db
Merge "Omaha #3179 added modes file deployment, moved modes.xml to new folder" into omaha_14.4.1
...
Former-commit-id: cc233ddcf7
[formerly 341170eb05
[formerly 77b58c5ba59c1a45f8ef3edb9fcc8cc5e1f063f7]]
Former-commit-id: 341170eb05
Former-commit-id: 1cb8903c73
2014-05-22 12:25:26 -05:00
Stephen Gilbert
94a1a64ef0
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-file-endpoint.xml
Change-Id: Id609c4bd0e120f357b15c8a859ec0ece54ed47e0
Former-commit-id: 7992a6b15b
[formerly 91d469eb90
[formerly 42eab5bcfeae6a2e1db32b83a68249bb37c9584e]]
Former-commit-id: 91d469eb90
Former-commit-id: 14258764bd
2014-05-22 12:39:09 -04:00
Roger Ferrel
466bfed41e
Issue #3181 Add check for valid array index.
...
Change-Id: I8e0a37bdd094b341da2ce42922a16d840d1ab468
Former-commit-id: adf6d95c01
[formerly a1f25b8748
[formerly ca01934f9e9d355dd4159fd472e2aa9bc0918898]]
Former-commit-id: a1f25b8748
Former-commit-id: fb4ac9acc7
2014-05-22 11:20:26 -05:00
Ben Steffensmeier
893e9fb191
Omaha #2913 Fix grib manifest depenency version.
...
Former-commit-id: f4d1e77301
[formerly 99bbb52689
[formerly 5481dea7c31ee65ea5515be2a9f88c1977a3dc59]]
Former-commit-id: 99bbb52689
Former-commit-id: 5548062960
2014-05-22 11:12:52 -05:00
Lee Venable
141e06c56b
Merge "Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version." into omaha_14.4.1
...
Former-commit-id: 5e81d6dbb3
[formerly 1822a27f2b
[formerly a339ce4bcab3e2edd969e33549599783c3e4416e]]
Former-commit-id: 1822a27f2b
Former-commit-id: 867116ab36
2014-05-22 09:57:56 -05:00
Richard Peter
86f23ff627
Merge "Omaha #2733 restored geomag distribution registration" into omaha_14.4.1
...
Former-commit-id: b4e52dfa8b
[formerly 31d1c868ac
[formerly deb953d3bf2907974d1fb499392ece710001288b]]
Former-commit-id: 31d1c868ac
Former-commit-id: c314ba8c28
2014-05-22 09:54:26 -05:00
Ron Anderson
4c33bf1b30
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 2a680b73ea
[formerly 52931af5ce
[formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]
Former-commit-id: 52931af5ce
Former-commit-id: a8ba16fc93
2014-05-22 09:53:47 -05:00
Brian Clements
a0fea52583
Omaha #2733 restored geomag distribution registration
...
added placeholder pattern so the plugin doesn't generate warnings
Former-commit-id: 21efc74635
[formerly 2ebc0a6ae5
[formerly fa73924a9c98705d00e6b68203e0cbe418e4cf01]]
Former-commit-id: 2ebc0a6ae5
Former-commit-id: 2563b644bd
2014-05-22 09:13:52 -05:00
Nate Jensen
bfc67a6036
Merge "Omaha #3093 add hprof output for grid cached data." into omaha_14.4.1
...
Former-commit-id: 7350bd5f07
[formerly dee7b221b2
[formerly 83e3d888511ec9f99fc534175314ecf5e054f725]]
Former-commit-id: dee7b221b2
Former-commit-id: 48e05989c0
2014-05-22 08:53:00 -05:00
Nate Jensen
e46beca6b7
Merge "Omaha #3093 Add option to hprof tool to zero primitive arrays for compression." into omaha_14.4.1
...
Former-commit-id: 8a7f83e86e
[formerly 339217ddb6
[formerly e385a0bb73510e3d1d366073976a05a74444e2c5]]
Former-commit-id: 339217ddb6
Former-commit-id: 2089860011
2014-05-22 08:47:00 -05:00
Nate Jensen
9e547e0273
Merge "Omaha #2913 Remove ability to create images from uengine." into omaha_14.4.1
...
Former-commit-id: 02108895f0
[formerly 74443038fc
[formerly feb218207bc20ba7cab026379e2ef0d2c0efb58c]]
Former-commit-id: 74443038fc
Former-commit-id: db3889a955
2014-05-22 08:45:16 -05:00
Brad Gonzales
b0e8fea5d2
Omaha #3156 Removed geronimo servlet 2.5 jar from dependencies.txt and added it to rpms/awips2.qpid/0.18/SOURCES/awips2/.
...
Change-Id: I92c8380cdabcb1d4a8ced7fb5ff7d5add0708d82
Former-commit-id: 1dd2a8bf65
[formerly 165f9a6e45
[formerly 71e43fad4acee381d7ffb7ca8ba0438283cd99f6]]
Former-commit-id: 165f9a6e45
Former-commit-id: 7d84f97bf8
2014-05-21 15:22:58 -05:00
Brian Clements
f795b57f87
Omaha #3179 added modes file deployment, moved modes.xml to new folder
...
Former-commit-id: e291a20abf
[formerly 952901624f
[formerly fd8a4b49641aaf70c49608215d15209330dee669]]
Former-commit-id: 952901624f
Former-commit-id: a740a1370f
2014-05-21 15:20:40 -05:00
Ben Steffensmeier
5ad9828170
Omaha #3093 add hprof output for grid cached data.
...
Former-commit-id: 405eabac07
[formerly 202321d897
[formerly d509822129823efcdf67dd9c028bc72af99b1039]]
Former-commit-id: 202321d897
Former-commit-id: 68c8895ee3
2014-05-21 14:48:45 -05:00
Ben Steffensmeier
c84ba8e188
Omaha #2913 Remove ability to create images from uengine.
...
Former-commit-id: b7d15aac22
[formerly ab739befec
[formerly f843fb4cdd78f4f847f0a2d45fe78106af88b3b4]]
Former-commit-id: ab739befec
Former-commit-id: c134e4ebaa
2014-05-21 14:40:00 -05:00
Ben Steffensmeier
15c7e3bb2d
Omaha #3093 Add option to hprof tool to zero primitive arrays for compression.
...
Former-commit-id: df62609973
[formerly 5554946186
[formerly 6a80964572cf331b433ae8dc222ac209dd35bf63]]
Former-commit-id: 5554946186
Former-commit-id: ede28797fd
2014-05-21 12:30:57 -05:00
Benjamin Phillippe
d9fb9f74ef
Omaha #3192 Fix broken build after CXF upgrade
...
Former-commit-id: 930b5b9621
[formerly 1ee8ceef1b
[formerly 8a1b9ed7d11aebed7c76b9701f236eaa150d0562]]
Former-commit-id: 1ee8ceef1b
Former-commit-id: e77c501f36
2014-05-21 10:36:39 -05:00
Richard Peter
4967854d11
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: f19fda01ad
[formerly db4c6c8c22
[formerly 052144dd9929d852543f4eaf959ca3ccce50c5a2]]
Former-commit-id: db4c6c8c22
Former-commit-id: dcaedf5d43
2014-05-20 17:14:29 -05:00
Brian Clements
c885bf9426
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: da7d5888b0
[formerly 5b5295e5ad
[formerly 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c]]
Former-commit-id: 5b5295e5ad
Former-commit-id: c55124bcc7
2014-05-20 16:07:20 -05:00
Richard Peter
9df96cc326
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: 2d4d89b3f0
[formerly 13ac6e8337
[formerly 62674d17c73d8fdbbe26916aba7ecac572eca2eb]]
Former-commit-id: 13ac6e8337
Former-commit-id: ab3a7a2804
2014-05-20 14:56:44 -05:00
Nate Jensen
8dc3683186
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 966cf1f96f
[formerly 1e408e7017
[formerly 62054f8f2552058b0b53b79b077a4d7699cb41e9]]
Former-commit-id: 1e408e7017
Former-commit-id: 77c77c6b8f
2014-05-20 14:51:05 -05:00
Nate Jensen
136ff2254b
Merge "Omaha #2913 Remove dead code using JAI" into omaha_14.4.1
...
Former-commit-id: 27560965ac
[formerly 4fe2982f39
[formerly dce3936281178cbb211441edd23feef1cb321be5]]
Former-commit-id: 4fe2982f39
Former-commit-id: 9f2dad4104
2014-05-20 14:49:35 -05:00
Brad Gonzales
35afb44d4b
Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
...
Amend: updated manifest.
Removed static imports.
Refactored String constants to Pattern constants in TafConstants.
Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
fixed .project. Updated yet more Patterns.
Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc
Former-commit-id: e560ce4880
[formerly 6b0e578fc1
[formerly f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2]]
Former-commit-id: 6b0e578fc1
Former-commit-id: c4890beb96
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
f010aa30b4
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: d48333444c
[formerly d5d3f5605a
[formerly 767fc083618827ad06beff9f6728ea9dd42528f6]]
Former-commit-id: d5d3f5605a
Former-commit-id: 59a108822e
2014-05-20 13:36:15 -05:00
Brian.Dyke
5afaee3d33
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: db68b80bbd
[formerly 2fd18d14d6
[formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: 2fd18d14d6
Former-commit-id: 822ad181bf
2014-05-20 14:35:34 -04:00
Ron Anderson
0e02e83629
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: 809548b283
[formerly 3b404f4083
[formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]
Former-commit-id: 3b404f4083
Former-commit-id: b794dd04e1
2014-05-20 11:10:26 -05:00
Brian.Dyke
9426ddb9a9
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-8 into 14.2.1
...
Former-commit-id: 8c2cccb930
[formerly e5f951bf89
[formerly d9c230fbd50cc5acf1dd5c7c5e775f337de41921]]
Former-commit-id: e5f951bf89
Former-commit-id: 88a5ecefaa
2014-05-20 12:08:29 -04:00
Brian Clements
83654c374a
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 8dce7e9b85
[formerly b774503931
[formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]
Former-commit-id: b774503931
Former-commit-id: 455af3612f
2014-05-20 11:04:57 -05:00
Bryan Kowal
2ed7be0b50
Omaha #3189 - update the PostgreSQL used by hydro / mpe NativeLib to match the baseline AWIPS II version.
...
amend: remove debug code
Change-Id: I16d16576af71ad02821c8e65c10081bda5d061e3
Former-commit-id: 76cd1c2ac8
[formerly c6518e7378
[formerly 9ad4422eb9911f8fbf0c5db40103ee8a1d925570]]
Former-commit-id: c6518e7378
Former-commit-id: 5ca6dfbf90
2014-05-20 11:02:31 -05:00
Brian.Dyke
c9ef80beeb
CM-MERGE:OB13.5.5-9 into 14.1.2
...
Former-commit-id: abf0f995cd
[formerly 545e7f6ce9
[formerly a2e2daca86d7efb28cb4e3eb8b9ef2ac92e1fc22]]
Former-commit-id: 545e7f6ce9
Former-commit-id: 8435ace4f8
2014-05-20 11:56:30 -04:00
Benjamin Phillippe
afe9235d33
Omaha #3192 Code fix related to upgrade of CXF to 2.7.10
...
Former-commit-id: 43423e38dc
[formerly 319a4a3cac
[formerly 4befa5f83ac0a9340a4b146953102a7e2f90f1b1]]
Former-commit-id: 319a4a3cac
Former-commit-id: 619601891a
2014-05-20 10:33:22 -05:00
Nate Jensen
8adbef2eb1
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: eff69410eb
[formerly 8d7125544b
[formerly 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569]]
Former-commit-id: 8d7125544b
Former-commit-id: f3f64b1e5a
2014-05-19 16:21:37 -05:00
Richard Peter
48236cfcee
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 87da8bd952
[formerly 40b7623c87
[formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]
Former-commit-id: 40b7623c87
Former-commit-id: 80a5f2fc1b
2014-05-19 16:07:51 -05:00
Brian Clements
5bf4c253f6
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: 573ffcb0bf
[formerly 0e18d45bdf
[formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]
Former-commit-id: 0e18d45bdf
Former-commit-id: b5e961d6b4
2014-05-19 15:54:36 -05:00
Brian Clements
aa51a7559d
Omaha #2536 fix text-request spring file
...
Former-commit-id: f47d49d5dd
[formerly 21723fca36
[formerly 9e06d55f20798b7be657318a2b147a56539fd7ab]]
Former-commit-id: 21723fca36
Former-commit-id: 5032c80d82
2014-05-19 15:23:25 -05:00
Ben Steffensmeier
a0ee307eaa
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: 31c323151c
[formerly 24b879764f
[formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]
Former-commit-id: 24b879764f
Former-commit-id: c4f9bab999
2014-05-19 14:21:23 -05:00
Nate Jensen
2213e727a5
Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
...
Former-commit-id: 94d032dbc4
[formerly 76bfba5945
[formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]
Former-commit-id: 76bfba5945
Former-commit-id: 9996d67317
2014-05-19 13:36:26 -05:00
Brian.Dyke
432e5f15a5
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
...
Former-commit-id: d5a4669fc4
[formerly dbd3bb54e8
[formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]
Former-commit-id: dbd3bb54e8
Former-commit-id: c4b7b8dd74
2014-05-19 14:07:04 -04:00