Brian Clements
2fd2b5aa16
Omaha #3206 added version to servlet api in cave feature
...
without this, the build prefers the javax.servlet in the target platform
Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80
Former-commit-id: d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2
2014-05-23 17:04:49 -05:00
Nate Jensen
b67bf1e492
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d
2014-05-22 16:46:50 -05:00
Steve Harris
b6af2db9f5
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: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
Brian Clements
c875f17719
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00
Steve Harris
2059fc9c0e
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: eae5c3e75061566e40194730c2cfb2003d952e62
2014-05-22 14:05:06 -05:00
Ron Anderson
2a680b73ea
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 8082b27e6e7e0a0be372abb40b62c0a0224ee49c
2014-05-22 09:53:47 -05:00
Richard Peter
f19fda01ad
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: 052144dd9929d852543f4eaf959ca3ccce50c5a2
2014-05-20 17:14:29 -05:00
Brian Clements
da7d5888b0
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c
2014-05-20 16:07:20 -05:00
Richard Peter
2d4d89b3f0
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: 62674d17c73d8fdbbe26916aba7ecac572eca2eb
2014-05-20 14:56:44 -05:00
Nate Jensen
966cf1f96f
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 62054f8f2552058b0b53b79b077a4d7699cb41e9
2014-05-20 14:51:05 -05:00
Brad Gonzales
e560ce4880
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: f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
d48333444c
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: 767fc083618827ad06beff9f6728ea9dd42528f6
2014-05-20 13:36:15 -05:00
Ron Anderson
809548b283
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b10be8ae235c4528c4ce83088daeccf8a0928933
2014-05-20 11:10:26 -05:00
Brian Clements
8dce7e9b85
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 4e6f168df1f957c5eed73a281441a0d4d0d76cdb
2014-05-20 11:04:57 -05:00
Nate Jensen
eff69410eb
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569
2014-05-19 16:21:37 -05:00
Richard Peter
87da8bd952
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 1f786fd25cab2956c2cc3318a7adbabf6e8c306d
2014-05-19 16:07:51 -05:00
Brian Clements
573ffcb0bf
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: 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
31c323151c
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807
2014-05-19 14:21:23 -05:00
Nate Jensen
94d032dbc4
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: 353d0ddca384a33fe529c0b920595a99c0f40548
2014-05-19 13:36:26 -05:00
Richard Peter
0480bfa478
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c
2014-05-19 12:12:05 -05:00
Nate Jensen
d79ef53ad0
Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
...
Former-commit-id: 6f3d40c96cafe8f0f05d539534607067a2a37776
2014-05-19 11:46:10 -05:00
Brian Clements
2f5cffbe15
Omaha #2536 merged uf.edex.textdbsrv into text plugins
...
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
25f901a102
Omaha #3164 Disable thin client request compression when it doesn't work.
...
Former-commit-id: ce132a929437f18f531503701bb09e33261ae4c4
2014-05-19 10:40:50 -05:00
brian.dyke
58683ad040
Merge branch 'master_14.3.1-4' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Ben Steffensmeier
a52718783a
Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
...
Former-commit-id: 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
8446ace149
Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
...
Former-commit-id: bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
79ef4a5301
Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
...
Former-commit-id: 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9
2014-05-16 12:50:48 -05:00
Nate Jensen
11c580549a
Omaha #3133 attempt to fix build
...
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212
Former-commit-id: 661a24eafe2374970982a137146c77d9ec1a1406
2014-05-15 17:02:27 -05:00
Nate Jensen
1ae82b82db
Omaha #3133 remove unused dependencies
...
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 5a00869db4e7467e49e9a632150a8135ea32b569
2014-05-15 13:57:55 -05:00
Nate Jensen
2cd5c8cca9
Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
...
Former-commit-id: b65ddc7f6f3831117ad3c0d517335289cba8ede0
2014-05-15 08:36:51 -05:00
Steve Harris
c83753b4d3
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: 5c1f5dbf543c9cd27cf83158308a9ce34d057201
2014-05-15 08:31:27 -05:00
Brian Clements
01269cd989
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5
2014-05-14 17:00:09 -05:00
Richard Peter
f6d1e1012e
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
...
Former-commit-id: 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0
2014-05-14 16:25:16 -05:00
Qinglu.Lin
c5097660c2
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
1db137a21e
Omaha #2697 Collaboration will no longer use local maps.
...
Former-commit-id: 7e10b6d308a3bb17692abaefd9a8e84cc5016621
2014-05-14 13:53:29 -05:00
Brian Clements
6bd43f79ff
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
2014-05-14 13:45:09 -05:00
Nate Jensen
5eaa5d7b0e
Omaha #3133 remove unused uf.common.cache from alertviz feature
...
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: e659b393f23e5e999c2b03ddad648f2748ee97e9
2014-05-13 17:52:12 -05:00
Bryan Kowal
8d5326cc1b
Issue #3159 - rebuild with newer gridslice source
...
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
2014-05-13 14:43:04 -05:00
Nate Jensen
174fae77d1
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
...
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: b842a78cdfb945767aecf7da3ad55b71c9d09bfb
2014-05-13 13:12:54 -05:00
Matthew Howard
576a2d63ec
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
...
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
2014-05-13 07:49:18 -05:00
Nate Jensen
b05630b171
Omaha #3133 remove edex dependencies from common.monitor plugin
...
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: d25e1bee210a084e17d4ee781eddb42c14735140
2014-05-12 16:46:06 -05:00
Steve Harris
6964df0664
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: a20833879f1a0434c562a22a874b1e1722278954
2014-05-12 15:05:43 -05:00
Zhidong.Hao
030b767299
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
...
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: a48b81894fed165aba58a0097359bbd0f1931be5
2014-05-12 15:16:38 -04:00
Juliya Dynina
e33a27684c
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
...
Former-commit-id: 0c54c56efa1306d781d64621ccf7f62b3bf70997
2014-05-12 14:01:40 -05:00
Juliya Dynina
4f7fa8a8de
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
...
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
2014-05-12 14:01:07 -05:00
Matthew Howard
0dc1db0072
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
2014-05-12 13:52:12 -05:00
Loubna.Bousaidi
d3be6d0476
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
2014-05-12 18:42:12 +00:00
Zhidong.Hao
074713bb4a
ASM #537 AvnFPS: Syntax failed to flag format error
...
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
2014-05-12 14:33:25 -04:00
Matthew Howard
42cce01396
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
...
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
2014-05-12 13:00:55 -05:00
Rici.Yu
96d1555012
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
...
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: df46f9fc541a47e5f31210663ef69c4c5863fa28
2014-05-12 13:38:04 -04:00