xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4456 commits 31 branches 40 tags 3.8 GiB
Commit graph

2525 commits

Author SHA1 Message Date
Brian Clements
f084679410 Issue #2563 roster updates for stock servers 
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]
Former-commit-id: 0882672686
 2013-12-20 12:03:04 -06:00
Brian Clements
5dcd524fa1 Issue #2563 compatibility features for stock xmpp servers 
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]
Former-commit-id: af83c0cf87
Former-commit-id: f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]
Former-commit-id: 917d8dffee
 2013-12-20 10:41:13 -06:00
Nate Jensen
41bd7c47da Merge "Issue #2562 moved session data from chat to packet extension" into development 
Former-commit-id: ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly 67ba8bb713 [formerly 54a986613a [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]
Former-commit-id: 67ba8bb713
Former-commit-id: f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea]
Former-commit-id: 2ceb8c2051
 2013-12-19 12:41:32 -06:00
Brian Clements
64dda165db Issue #2562 moved session data from chat to packet extension 
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]
Former-commit-id: d58f8d7134
 2013-12-19 12:08:21 -06:00
Steve Harris
0a47657ba3 Merge branch 'omaha_14.2.1' into development 
Former-commit-id: 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 0950a8a1ba [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]
Former-commit-id: 64f8564cd8
Former-commit-id: d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d]
Former-commit-id: 21aaafbd52
 2013-12-18 13:14:27 -06:00
Richard Peter
73f12bf669 Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7

Former-commit-id: cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]
Former-commit-id: 5c0cf804f1
 2013-12-17 21:04:53 -06:00
Mike Duff
ca4bb45e94 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph 
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]
Former-commit-id: 0232f16e7a
 2013-12-17 09:41:30 -06:00
Bryan Kowal
a63bda59b4 Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf 
Amend: wrap file access in try..finally; move StringBuilder outside of a loop

Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da

Former-commit-id: b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]
Former-commit-id: 68181d3f62
 2013-12-16 16:39:10 -06:00
Lee Venable
df1150692d Issue #2583 - Procedure dialog fixes and clean up. 
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

Former-commit-id: 197a8b5508 [formerly d6eb7534f5] [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly aa0e9121f8 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: 0af2a615c742e34adbdfd0a6913eb7d563f108fa [formerly f3c8b69e2e]
Former-commit-id: d05d650430
 2013-12-12 16:15:56 -06:00
Steve Harris
690b177ded 14.1.1-13 baseline 
Former-commit-id: a2ae393ec1 [formerly 85eebac7e2] [formerly c88b10039a] [formerly b0b55a676b [formerly c88b10039a [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: afbe4db73cf4d0b084a0f0de6518f4b936da3cee [formerly 61d4adc979]
Former-commit-id: 5368f23247
 2013-12-12 16:59:57 -05:00
Jonathan Sanchez
bef733bb8f Issue #2604 Refactored portions util out of viz.warngen. 
Change-Id: I58fad25e0a53d34b3369d6b6463f29e753cb6d10

Former-commit-id: 966f814d2d [formerly 9878c3a797] [formerly 125e747fc9] [formerly 2ecfe79516 [formerly 125e747fc9 [formerly ae9f22dbfce191c79e170b242bfc0c905b61e9bf]]]
Former-commit-id: 2ecfe79516
Former-commit-id: 77df683bd7320416ea169ad18d4f073fee509742 [formerly 5796d108c3]
Former-commit-id: 45903c0e7d
 2013-12-11 14:59:16 -06:00
Ben Steffensmeier
f62b7011b7 Issue #2602 Switch around the order of some things on startup to make thinclient better. 
Former-commit-id: c92b5842ab [formerly bf508b4455] [formerly a37db9d1b4] [formerly 922674273e [formerly a37db9d1b4 [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 7b5206504ecad1e36005120b31bf8d5def0e3bf5 [formerly 4a86c90bfc]
Former-commit-id: 0fb85fe4aa
 2013-12-11 12:45:11 -06:00
Slav Korolev
c1b72b0e10 Issue #2570. Show All subscriptions in Subscription manager. 
Former-commit-id: 51c0f8f92f [formerly 85bc26b5a3] [formerly b59e9499d2] [formerly 67e18055cc [formerly b59e9499d2 [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 9efd61bf39542c3ae92ed81de94a71f51cb52f27 [formerly 6811b0e5c1]
Former-commit-id: 746157755b
 2013-12-11 08:57:13 -05:00
Nate Jensen
ee8d223346 Merge "Issue #2620 Fixed viz base feature dependency issues." into development 
Former-commit-id: 3c728333b7 [formerly c4c61022b9] [formerly 4c90d4c5f6] [formerly cd58066889 [formerly 4c90d4c5f6 [formerly e41526263edecf1e867c27ccb89b6326f9675a85]]]
Former-commit-id: cd58066889
Former-commit-id: 823402ec5485e61576f944862a7a0a2a71242200 [formerly 8194559a6e]
Former-commit-id: 9a03bf5943
 2013-12-10 10:24:25 -06:00
Mike Duff
24ae26ef90 Issue #2601 - Fix NullPointerException. 
Former-commit-id: 8b49b1dea7 [formerly 773e546f62] [formerly 9e9706f55f] [formerly d2fe42c27c [formerly 9e9706f55f [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: d6664cc0a8ed267b96caf4d313f4f99d96961e7e [formerly 32b468023d]
Former-commit-id: 02bbd4eaa6
 2013-12-10 09:03:42 -06:00
Max Schenkelberg
774859fcb9 Issue #2620 Fixed viz base feature dependency issues. 
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]
Former-commit-id: 987d4b3a30
Former-commit-id: f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]
Former-commit-id: e86e477165
 2013-12-09 15:14:01 -06:00
Lee Venable
b342346474 Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1 
Former-commit-id: 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 2c6b4309f0 [formerly 249435f17c [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d]
Former-commit-id: 4850830125
 2013-12-09 09:51:41 -06:00
Brian Clements
4d04f6edbf Issue #2561 removed ECF from collaboration 
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]
Former-commit-id: 5a7fca6352
 2013-12-06 17:07:16 -06:00
Mike Duff
5299287b65 Issue #2271 - Fix menu problem with previously selected points being selectable again 
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 0a5f2e3484 [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd]
Former-commit-id: 1925177772
 2013-12-06 12:58:38 -06:00
Nate Jensen
71bc390b4f Issue #2599 fix constructor 
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

Former-commit-id: 899bc199bb [formerly ec6b5393ef] [formerly 9bff38e0d3] [formerly 41014a105d [formerly 9bff38e0d3 [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: 8c75e2081d678b06e6390ca47fa30f36b8fcd47a [formerly f3e455d1a3]
Former-commit-id: e8f28c6799
 2013-12-06 12:35:22 -06:00
Ben Steffensmeier
57de1adb55 Issue #2537 Fix feature for poitndata dependency on dataaccess. 
Former-commit-id: 258988c269 [formerly 067c510315] [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 59c6a24b68 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 0119ce6ac19df37c80d8dfefa6dbbff1e8a7d526 [formerly 99afa17fd2]
Former-commit-id: 899cb2628c
 2013-12-06 09:14:01 -06:00
Richard Peter
3088533103 Merge "Issue #2545 - Get bandwidth graph data by network" into development 
Former-commit-id: da82396995 [formerly df4a4c5121] [formerly d0b50eee3c] [formerly 6fde307f0a [formerly d0b50eee3c [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: ab63c3e242c8f489c2b55d427b4ca49dfd7b4657 [formerly 9f4dfc9051]
Former-commit-id: 45889cb80f
 2013-12-05 14:54:46 -06:00
Mike Duff
802e0d360c Issue #2545 - Get bandwidth graph data by network 
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]
Former-commit-id: 45cf9384d8
 2013-12-05 13:35:31 -06:00
Nate Jensen
ad2b7df40b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development 
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]
Former-commit-id: 15fee953f5
 2013-12-05 12:59:58 -06:00
Richard Peter
530b3bd588 Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]
Former-commit-id: 60679a818a
 2013-12-05 12:12:27 -06:00
Ben Steffensmeier
6ebc4e5fbc Issue #2537 Use PointDataAccessFactory for multiple point data types. 
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly 9df4f83a0cf5042c67bf0eccc5635e37d1e149a8 [formerly f682e66e9b]] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]
Former-commit-id: fde968a834
 2013-12-05 10:54:28 -06:00
Lee Venable
0a9dcb2cc4 Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1 
Former-commit-id: 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]
Former-commit-id: 40dc07e0ff
 2013-12-05 08:30:28 -06:00
Lee Venable
35352350b7 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground. 
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

Former-commit-id: d420f11832 [formerly 9c64148733] [formerly 266d4884da] [formerly a385ec612c [formerly 266d4884da [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: a8a45bbbf444fd2b11c872dd17abd893d3419ecd [formerly d433717c8c]
Former-commit-id: cddca699c6
 2013-12-05 08:25:46 -06:00
Ron Anderson
fb3b7b0a9f Issue #2331 Fixed Topo retrieval for smartTools/procedures 
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3

Former-commit-id: 218a052bbf [formerly 497236ca74] [formerly b5906249cc] [formerly 20eeb2796e [formerly b5906249cc [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: 473bec12d3fe432d141080f1a78bde66bd1ac17b [formerly 103fed386f]
Former-commit-id: e30d6041ee
 2013-12-04 17:10:48 -06:00
Steve Harris
1e4b2bac7b 14.1.1-12 baseline 
Former-commit-id: f53eb87892 [formerly 371d1ca63c] [formerly b24d9c80b0] [formerly a3ec45a99f [formerly b24d9c80b0 [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 78fc95a6e82a286a422cf62a1c8adc867f7438c4 [formerly 14421048af]
Former-commit-id: 4e6f319422
 2013-12-04 16:47:59 -05:00
Ron Anderson
21f431f203 Issue #2490 Fixed error handling in HazardsTable.py 
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]
Former-commit-id: a99197c5c2
 2013-12-04 15:29:28 -06:00
Nate Jensen
3c8d882681 Merge "Issue #2600 Fix typo in DataStoreCache." into development 
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]
Former-commit-id: 331df460ff
 2013-12-04 11:54:11 -06:00
Dave Hladky
085b6124b9 Issue #2607 Fixed Nullpointer 
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]
Former-commit-id: c93d7b57a1
 2013-12-04 11:36:23 -06:00
Ben Steffensmeier
76c989a47d Issue #2600 Fix typo in DataStoreCache. 
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]
Former-commit-id: d6640590e9
 2013-12-04 11:22:47 -06:00
Nate Jensen
f2a827f884 Merge "Issue #2576 Increased the font size of EMER." into development 
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]
Former-commit-id: c29836abd7
Former-commit-id: 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]
Former-commit-id: cb3d6e2de3
 2013-12-03 17:44:55 -06:00
Richard Peter
2cafd3a81b Merge branch 'development_on_RHEL5' (GOES-R) into development 
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 7969ef9648 [formerly 760f215e8c] [formerly f6787c0b9f2cb0cae1c07a2111e91ecfc12f31f5 [formerly f5f75ec629]] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]
Former-commit-id: ee03dcf505
 2013-12-03 16:25:31 -06:00
Jonathan Sanchez
1e475d6b33 Issue #2576 Increased the font size of EMER. 
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]
Former-commit-id: eeb3b0173b
Former-commit-id: cd3195def23d760eed1c4717d9bf0fee8c3ced2a [formerly dc4b8ec40f]
Former-commit-id: 641673e1d5
 2013-12-03 13:00:47 -06:00
Nate Jensen
38c40514e6 Merge "Issue #2573 safer and faster progressive disclosure" into development 
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]
Former-commit-id: b6e54e2709
 2013-12-03 09:41:02 -06:00
Nate Jensen
d035dbc831 Issue #2573 safer and faster progressive disclosure 
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly c0140fa0d91182080c96b83ad820144fcddbba66 [formerly 622cc1b223]] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]
Former-commit-id: e5cfe76cac
 2013-12-02 17:28:09 -06:00
Steve Harris
b455a385e9 Merge branch 'master_14.1.1' into omaha_14.1.1 
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]
Former-commit-id: 1195e95c8b
 2013-12-02 16:17:38 -06:00
Steve Harris
41a54a5ca6 14.1.1-11 baseline 
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly bcc2fb56db7acfd2f7ecd928f118488dc7beb36e [formerly 70a6f1936e]] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]
Former-commit-id: 8bd818de09
 2013-12-02 17:10:10 -05:00
Slav Korolev
4a2e195ea2 Issue #2387. Added system status refresh. 
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]
Former-commit-id: 3dc318418e
 2013-12-02 16:14:45 -05:00
Ben Steffensmeier
65147cfb78 Issue #2537 point data code cleanup. 
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]
Former-commit-id: a4e3bf34b8
 2013-11-26 15:16:54 -06:00
Ben Steffensmeier
56456894f1 Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images 
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0

Former-commit-id: dcfdc9a24b [formerly 8a7d3ceab1] [formerly 192772b92c8a86ee4d2a06670357a91aa3f822cd [formerly 927801985a]] [formerly 3696896b49 [formerly 927801985a [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: a7cbce5b5d72746638add296db468539851abb4e [formerly 70ca78c7b5]
Former-commit-id: ca5e771451
 2013-11-25 11:31:57 -06:00
Richard Peter
26eb16cae1 Merge "Issue #2532 Fix grid displays of grids larger than the world." into development 
Former-commit-id: 551ccf368d [formerly 4b09affc7c] [formerly b26e562845] [formerly be7c2ef08e [formerly b26e562845 [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: b4dd124c6256f5d1be94fb46c9a4a162c713aed8 [formerly c51cc4bf17]
Former-commit-id: d1201473cd
 2013-11-22 12:38:05 -06:00
Nate Jensen
873a26a6a7 Merge "Issue #2361 fix style manager's jaxb context" into development 
Former-commit-id: 591dcce82e [formerly 38fdf1edcf] [formerly 9de7c7f434] [formerly 49ce4d4be3 [formerly 9de7c7f434 [formerly 0b018d8cd8f9738eb11897f07a83a5e370dcbcac]]]
Former-commit-id: 49ce4d4be3
Former-commit-id: 562f912e8920c73d85c6d405361ce0180caa8daf [formerly 6ab6de4419]
Former-commit-id: e049c8aca2
 2013-11-22 10:08:13 -06:00
Nate Jensen
bf3e9e95e6 Issue #2361 fix style manager's jaxb context 
Change-Id: I273c2361739e7860bd92a8c86d8f806b677f1f68

Former-commit-id: 905879ba90 [formerly 2c61b8f4d6] [formerly 16329ab06b] [formerly 328991e577 [formerly 16329ab06b [formerly 2fddfc61fb8de88a67deb5b66a570ca548628ab3]]]
Former-commit-id: 328991e577
Former-commit-id: 3170492ca14e7028f5daf3a156117f991ebeea59 [formerly ebc3efdf80]
Former-commit-id: 24e99ec924
 2013-11-22 09:15:24 -06:00
Dave Hladky
ad8acfb5f4 Issue #2554 added explicit threading to WFS, ability to send GZIP requests, fixed maxfeatures, fixed adhoc display 
Former-commit-id: 162dcb3f42 [formerly 233238d8df] [formerly 04c7e2cffc] [formerly a9a3973319 [formerly 04c7e2cffc [formerly e79ff905cbe3330dbe22b6663753e1d5e6dbe7bd]]]
Former-commit-id: a9a3973319
Former-commit-id: 72c3d32a8a4aa43ecf8d033ca096d32cb261c568 [formerly ebd6d5cbe1]
Former-commit-id: cebf79ad44
 2013-11-21 14:46:47 -06:00
Nate Jensen
a95890a5c8 Merge "Issue #2033 fix plots working with multiple plotModels dirs contributed by different plugins" into development 
Former-commit-id: 9c2398a7dd [formerly 32cbfd6150] [formerly ddb0eaf0ff] [formerly d851e6fc97 [formerly ddb0eaf0ff [formerly 8f5078ce2a5369c62073a70b1772c2d0c96317fa]]]
Former-commit-id: d851e6fc97
Former-commit-id: c5557070349346f520ff88e345376e2ce126e8b0 [formerly f60948fc36]
Former-commit-id: f5a2c7298a
 2013-11-21 10:12:11 -06:00
Nate Jensen
68ac9daf67 Issue #2033 fix plots working with multiple plotModels dirs contributed 
by different plugins

Change-Id: I2d1ff75c62395ead5154398002610401faa4388d

Former-commit-id: 8a2c4ced39 [formerly b3028b4f39] [formerly 9371c63c41] [formerly 2b6799712d [formerly 9371c63c41 [formerly 0ed68f5ec6b2b2f3413f7de5f9c7b15291afb85c]]]
Former-commit-id: 2b6799712d
Former-commit-id: 6e959cad50fac90ee22febf459ef923945938143 [formerly 3e88de72dc]
Former-commit-id: 87dc5fb261
 2013-11-20 17:33:53 -06:00