Commit graph

2532 commits

Author SHA1 Message Date
Nate Jensen
ce391a5ad2 Merge "Issue #2563 fixed default xmpp port" into development
Former-commit-id: 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 2de703f6e8 [formerly 26f37a2fd4] [formerly 92e1df8856] [formerly 87876790f8 [formerly 92e1df8856 [formerly 4aa2f1689442ce630c94b73ad6747acd93a9c1ff]]]]
Former-commit-id: 87876790f8
Former-commit-id: 15c555bd0e [formerly 527e0197be] [formerly 7d4ac4c2b24db7918d4a19a0abd00db4ed4b6787 [formerly 365c11c9db]]
Former-commit-id: e9a8f911ffba5de1c641bac4d38f9972e6268733 [formerly 3606a4fdcf]
Former-commit-id: be8247e7ae
2014-01-07 12:39:46 -06:00
Brian Clements
5e09af067a Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 0193a9db0f [formerly 373feec7f5] [formerly 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]]
Former-commit-id: 1e7281dd25d0e4462914a8f28e264032b5f0222a [formerly 22f322d887]
Former-commit-id: 426bb7b944
2014-01-07 10:52:50 -06:00
Slav Korolev
ac5540213e Issue #2653. Corrected decoding of SNOW monitor data.
Former-commit-id: 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly 696728bafd [formerly 5bbb774073] [formerly 714fd018ef] [formerly ab7fc816b4 [formerly 714fd018ef [formerly 050f002ff7af3e68c31f5c1949ff5f82fa2e7a9b]]]]
Former-commit-id: ab7fc816b4
Former-commit-id: 679b61deea [formerly eb5ec35275] [formerly 5aa04e4abf5d9d29b644d2a212f6393c065cce96 [formerly 0fb9810e91]]
Former-commit-id: 9c64be7095aadcd4adef7f3b53b64c6684b3b86d [formerly 4fd070dd46]
Former-commit-id: 4c3ce254b6
2014-01-07 11:48:13 -05:00
Nate Jensen
2b2342a812 Merge "Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins." into development
Former-commit-id: 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 49a892b402 [formerly 6969518530] [formerly 6c5b954cf1] [formerly 23b4da6615 [formerly 6c5b954cf1 [formerly 8b4fb3f49556903dba6e0459adddd8850a373960]]]]
Former-commit-id: 23b4da6615
Former-commit-id: 8cb9853117 [formerly 1568132e22] [formerly 0919175dd8e25d11fa16d9abfc144bbb47e10bf3 [formerly 72e77fc4b1]]
Former-commit-id: 744667c346dcb6ad84149455d2e66806521bc603 [formerly 9e7c5fc54a]
Former-commit-id: 0f7a533d73
2014-01-07 08:46:02 -06:00
Max Schenkelberg
e0b7ba7058 Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.
Amend: Changed version numbers per discussion
Amend: Actually added changed files to the index

Change-Id: Ife7063ed538efe48a264b69c441e6f2dc3746dd5

Former-commit-id: 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly 30059d255c [formerly b3aed99142] [formerly 16046a4dde] [formerly cc2080449c [formerly 16046a4dde [formerly b65366dcdfa48e431b5c8bf10a72879b111cfd8d]]]]
Former-commit-id: cc2080449c
Former-commit-id: 257553461b [formerly 0ceaa43902] [formerly d612c358920d902e7385e86659fc1d050de57dd4 [formerly f58795f460]]
Former-commit-id: e6116ab5b34627162fc751f613c0b7f4743d9668 [formerly 789a279475]
Former-commit-id: 783391423f
2014-01-06 17:03:45 -06:00
Brian Clements
4d02d8e6e7 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]]
Former-commit-id: b01e6f0c98
Former-commit-id: bed3b77948 [formerly 74c6fdc613] [formerly 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]]
Former-commit-id: b1724173d1c849579e5b1f5b75eabd48144df579 [formerly 37be43af82]
Former-commit-id: dd6fd2532c
2014-01-06 14:14:38 -06:00
Brian Clements
869430c984 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]]
Former-commit-id: d07bc465d4
Former-commit-id: 95c30dbe0f [formerly 5dcaa98110] [formerly 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]]
Former-commit-id: 17d976b3c03dfc4f2e898f19d4930be8e9d50ba3 [formerly 70d4484473]
Former-commit-id: 73a3213cd1
2013-12-20 14:40:00 -06:00
Brian Clements
4f746b4f28 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 b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: f084679410 [formerly 0882672686] [formerly 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]]
Former-commit-id: 68b1173a4b1aa0aa641dc59b6cc4c8c527791d0b [formerly 98fd3e6a4c]
Former-commit-id: 41f6c010af
2013-12-20 12:03:04 -06:00
Brian Clements
30d12d2955 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 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]]
Former-commit-id: af83c0cf87
Former-commit-id: 5dcd524fa1 [formerly 917d8dffee] [formerly f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]]
Former-commit-id: 50f340c4c8e121845c4210287609a1479f391ceb [formerly e5430b4510]
Former-commit-id: b9977a1357
2013-12-20 10:41:13 -06:00
Nate Jensen
1aac78c117 Merge "Issue #2562 moved session data from chat to packet extension" into development
Former-commit-id: ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly ee5e00e6d6 [formerly ab5de71978] [formerly 54a986613a] [formerly 67ba8bb713 [formerly 54a986613a [formerly 2bfedeebc2051fa8f1be5277224cafa598796bdf]]]]
Former-commit-id: 67ba8bb713
Former-commit-id: 41bd7c47da [formerly 2ceb8c2051] [formerly f70ab4d6017a4ef18430da4722a242c647fc775f [formerly c61ac618ea]]
Former-commit-id: 8d937b5fc66acb18d8b064e99513a62e15f1a28b [formerly 8cfa9e9e15]
Former-commit-id: 7d40d1cacb
2013-12-19 12:41:32 -06:00
Brian Clements
5ab073884a 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 c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 64dda165db [formerly d58f8d7134] [formerly 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]]
Former-commit-id: 29642bf8db563174d87d99cd43c522c3dc419a43 [formerly aa8d869635]
Former-commit-id: 5ede797e27
2013-12-19 12:08:21 -06:00
Steve Harris
547577784f Merge branch 'omaha_14.2.1' into development
Former-commit-id: 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 36b228cc7f [formerly 8aac57e096] [formerly 0950a8a1ba] [formerly 64f8564cd8 [formerly 0950a8a1ba [formerly 71a8fd9b0659b06e366e734c06fa74232787238b]]]]
Former-commit-id: 64f8564cd8
Former-commit-id: 0a47657ba3 [formerly 21aaafbd52] [formerly d06360f4d96492a1e44ce6135ec70d7fc3b2bcbf [formerly 5d6bae317d]]
Former-commit-id: 94eb7477ee0e10f6b0a819a42d1f575a968062b8 [formerly bb449e689e]
Former-commit-id: afb79e8384
2013-12-18 13:14:27 -06:00
Richard Peter
08d2290f97 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 cc89b16338 [formerly e4f59ea119] [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 1de516964b [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 73f12bf669 [formerly 5c0cf804f1] [formerly 2e1688da3b0fce728ce5f4d9180206023aa31cf3 [formerly 62fa535744]]
Former-commit-id: 3e8093536581ac6595438ca5eb497ae394fe30e8 [formerly 4059813742]
Former-commit-id: 1c743d4d44
2013-12-17 21:04:53 -06:00
Mike Duff
8d04d1c8e9 Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly c5dbf9536d [formerly e26bea423e] [formerly 66f5585774] [formerly 6406bcdd05 [formerly 66f5585774 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]]
Former-commit-id: 6406bcdd05
Former-commit-id: ca4bb45e94 [formerly 0232f16e7a] [formerly dc31710b1c3cf0e82793c4e06ce4b433634d350a [formerly 54f7feef03]]
Former-commit-id: 8772cea891664095b1629a3cbe927489ed48e4c5 [formerly b54ab4df6a]
Former-commit-id: 707ac59a98
2013-12-17 09:41:30 -06:00
Bryan Kowal
c8e49142f2 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 b2550c873b [formerly 0c3b22c8f2] [formerly 43008f4698] [formerly 120ebd045a [formerly 43008f4698 [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]]
Former-commit-id: 120ebd045a
Former-commit-id: a63bda59b4 [formerly 68181d3f62] [formerly 1ab6f3920db4e2de42353fe97a9c4fe694df0851 [formerly fac9d72cc8]]
Former-commit-id: ea54fc6cf0eb39a2eb253d886a1e3180ccf382a0 [formerly 9e0e6662c8]
Former-commit-id: fad82481c1
2013-12-16 16:39:10 -06:00
Lee Venable
b261eca351 Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10

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

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

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
2013-12-09 15:14:01 -06:00
Lee Venable
54e6a2966b 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 77f637dff1 [formerly 997c575919] [formerly 249435f17c] [formerly 2c6b4309f0 [formerly 249435f17c [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: b342346474 [formerly 4850830125] [formerly 3186e75460a5b4acb8c484648f1f445e432dee15 [formerly cc7885610d]]
Former-commit-id: e223fbba6ede8a8a7283fdd9d05141d71618788d [formerly 291c7f95c4]
Former-commit-id: 099f3f504a
2013-12-09 09:51:41 -06:00
Brian Clements
1197d89ded 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 d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 4d04f6edbf [formerly 5a7fca6352] [formerly ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]]
Former-commit-id: ebcbc592123de417dee62c72e2708e136768fd8e [formerly 0cf7b822ce]
Former-commit-id: d7ddaa295d
2013-12-06 17:07:16 -06:00
Mike Duff
ae342f5a43 Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee

Former-commit-id: e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly e91227bad4 [formerly 850e4dfbde] [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 0a5f2e3484 [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 5299287b65 [formerly 1925177772] [formerly 10eeac71861238a8de2287ad168fcc62e2afd598 [formerly 4d210517bd]]
Former-commit-id: dec6566c173e4f7fff1a056f14a0c7192f0bbc0c [formerly 96de34b2c1]
Former-commit-id: 74b19522a2
2013-12-06 12:58:38 -06:00
Nate Jensen
84c16f84ac Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e

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

Former-commit-id: c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly c7345582e9 [formerly a412a19583] [formerly 4796f43495] [formerly 0c452e2434 [formerly 4796f43495 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]]
Former-commit-id: 0c452e2434
Former-commit-id: 802e0d360c [formerly 45cf9384d8] [formerly 0a68403f743b2b5033d96fa1433b811164defb55 [formerly 7f2ddb1360]]
Former-commit-id: 6357394278816b4bba40d3a8336a9f549bcbbad8 [formerly d3c5ee0468]
Former-commit-id: 0885df1d3f
2013-12-05 13:35:31 -06:00
Nate Jensen
200183a10b Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly 65e20edacf [formerly b16c88133b] [formerly c47f6546dd] [formerly ae0bd2a86f [formerly c47f6546dd [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: ad2b7df40b [formerly 15fee953f5] [formerly e0720d869c55d2c9da519b9b077f3fd06f02207e [formerly 7163e28d35]]
Former-commit-id: 8d7ad4d8fd6c5d67b7d5e36dddea37c59b03c830 [formerly bd4e9158f0]
Former-commit-id: 9740b5349b
2013-12-05 12:59:58 -06:00
Richard Peter
f362062048 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 ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
2013-12-05 12:12:27 -06:00
Ben Steffensmeier
84825d1841 Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc

Former-commit-id: 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 318e48c945 [formerly 7c2a4ef72c] [formerly f682e66e9b] [formerly 46a466497c [formerly f682e66e9b [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]]
Former-commit-id: 46a466497c
Former-commit-id: 6ebc4e5fbc [formerly fde968a834] [formerly a3846ce22f8e198d3cc7cd225b88e3fcecf8d9a7 [formerly ad9fee446d]]
Former-commit-id: 127df8be9a4be1f882d7db4b5b59fec0343ae2c3 [formerly 956e8b04f2]
Former-commit-id: 2eb9a45951
2013-12-05 10:54:28 -06:00
Lee Venable
c734fc4ad3 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 93a5c3f746 [formerly 67accdb7e3] [formerly 4f1b663b37] [formerly b7be687903 [formerly 4f1b663b37 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]]
Former-commit-id: b7be687903
Former-commit-id: 0a9dcb2cc4 [formerly 40dc07e0ff] [formerly 7f9e4e582c0c271e96b06859da97ccb310d3b7f3 [formerly 3a3333e4ec]]
Former-commit-id: 05a05f7fdac155b046e7212956138fe3b43c5264 [formerly 195162014d]
Former-commit-id: 0ef3c4386d
2013-12-05 08:30:28 -06:00
Lee Venable
d699aabd99 Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b

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

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

Former-commit-id: 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly 22b56c725c [formerly 54219aa03d] [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 7459d65134 [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: 21f431f203 [formerly a99197c5c2] [formerly 5277e256cdac93c4f9b0fa236643a91c2e6af6d3 [formerly 75d2dd7a29]]
Former-commit-id: 0193b4e72e257f2b7fccd9d06a481874e19ebeef [formerly 1988e86bbd]
Former-commit-id: 95d6bebb13
2013-12-04 15:29:28 -06:00
Nate Jensen
ef9d5e9f15 Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 5294fbe981 [formerly 286539f323] [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 020c4de47d [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 3c8d882681 [formerly 331df460ff] [formerly 18066d784d37837fbb075e69dd1c460fc818ba15 [formerly 78629260d9]]
Former-commit-id: baef817fbd402f74ebdcc42f8c8e67374bfa1bc3 [formerly 35abe8c3af]
Former-commit-id: b6f9b78e92
2013-12-04 11:54:11 -06:00
Dave Hladky
c9644b91ed Issue #2607 Fixed Nullpointer
Former-commit-id: 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 2184ded94c [formerly 4b81f76ce3] [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 25ce37d2d8 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]]
Former-commit-id: 25f745bc12
Former-commit-id: 085b6124b9 [formerly c93d7b57a1] [formerly 49cf33fb3030ab031805f86093adaaab234f3b6d [formerly b0f12b6613]]
Former-commit-id: d4b639f2168ea27ca32fecf44774479f0c1f770c [formerly 3cf23e1e4d]
Former-commit-id: 393d4a2967
2013-12-04 11:36:23 -06:00
Ben Steffensmeier
e359c36fd8 Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly ff5267fc07 [formerly 80a98a3d7e] [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 3c8962fb96 [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: 76c989a47d [formerly d6640590e9] [formerly a01200be83dcf0244764eae09c7c177e81901fa3 [formerly d1b4fdd9c8]]
Former-commit-id: 41865ec7e304f1812b2137c264a6494932b7e22b [formerly cb6d8f6070]
Former-commit-id: ea09aaff72
2013-12-04 11:22:47 -06:00
Nate Jensen
af6baf91c7 Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly 7045c11eee [formerly ee18295efe] [formerly cc53373478] [formerly c29836abd7 [formerly cc53373478 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]]
Former-commit-id: c29836abd7
Former-commit-id: f2a827f884 [formerly cb3d6e2de3] [formerly 14135ca8d7f458242a1ad82bca5ddb70fc04057c [formerly bad9e2ab44]]
Former-commit-id: 197acb24ea07e1c4a72c16927485bb24f7b34c1c [formerly b58a9fbed7]
Former-commit-id: 92fb530969
2013-12-03 17:44:55 -06:00
Richard Peter
2e90e498f3 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 f5f75ec629] [formerly 7969ef9648 [formerly 760f215e8c] [formerly f5f75ec629] [formerly e82e1137f9 [formerly f5f75ec629 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]]
Former-commit-id: e82e1137f9
Former-commit-id: 2cafd3a81b [formerly ee03dcf505] [formerly cecc12c190bbaa908cbfe835a5a9a64a5ba96dba [formerly 94994868fa]]
Former-commit-id: d636e539a84c2fe845b3dcfc419fff85a3a47055 [formerly b0e694483f]
Former-commit-id: 30862929e2
2013-12-03 16:25:31 -06:00
Jonathan Sanchez
f6301e6b23 Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1

Former-commit-id: 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly 7d9f3d9372 [formerly b8fd84509d] [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 88f7b75df4 [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]]
Former-commit-id: eeb3b0173b
Former-commit-id: 1e475d6b33 [formerly 641673e1d5] [formerly cd3195def23d760eed1c4717d9bf0fee8c3ced2a [formerly dc4b8ec40f]]
Former-commit-id: e03027b764b8ea79c6dfa043c06c44c33b01c48a [formerly e0b5d6f75d]
Former-commit-id: bcfa6bb00b
2013-12-03 13:00:47 -06:00
Nate Jensen
3804cdf794 Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly cc32c128f2 [formerly b8116e6724] [formerly ece38c85c0] [formerly 2daf0f2691 [formerly ece38c85c0 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]]
Former-commit-id: 2daf0f2691
Former-commit-id: 38c40514e6 [formerly b6e54e2709] [formerly 7e05c5f491df89f47bf393e694a7be30c7d2023e [formerly a5cf904e1f]]
Former-commit-id: 23d82665adeab525d91c44171b8bbdfc67ba46ee [formerly 57d1764c46]
Former-commit-id: c4f8d3e8d5
2013-12-03 09:41:02 -06:00
Nate Jensen
72ed3cce85 Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd

Former-commit-id: ccf897af6f [formerly 5c80b34e16] [formerly 622cc1b223] [formerly ccf897af6f [formerly 5c80b34e16] [formerly 622cc1b223] [formerly 90d6b5bd74 [formerly 622cc1b223 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: d035dbc831 [formerly e5cfe76cac] [formerly dd9050e05479911da92df93995a1c5e0aaf757e8 [formerly e40c71acd1]]
Former-commit-id: c1d11a887f87c095f57beb9114d2c95e789951a2 [formerly ecd87941e6]
Former-commit-id: cd258c50ee
2013-12-02 17:28:09 -06:00
Steve Harris
c01c05f777 Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly d33e61a80e [formerly b0a61f5695] [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 65d5f13864 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: b455a385e9 [formerly 1195e95c8b] [formerly b210ab8842ebdea3014e30e92d627d7f9a1742d7 [formerly 6539b80ded]]
Former-commit-id: b298b019250daf5a2e5c72bbc4f82d1267a2ad12 [formerly 2e47683d4a]
Former-commit-id: 6f4e8734c8
2013-12-02 16:17:38 -06:00
Steve Harris
941d5f65df 14.1.1-11 baseline
Former-commit-id: 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 401ee156b8 [formerly 337b138200] [formerly 70a6f1936e] [formerly 71ae71c850 [formerly 70a6f1936e [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]]
Former-commit-id: 71ae71c850
Former-commit-id: 41a54a5ca6 [formerly 8bd818de09] [formerly 2a75dd3165e6ee0eb548ce9cbb694967018bb4bf [formerly 5526a8999d]]
Former-commit-id: 163b900bd16bb48d13431ad4d1511ea0204fdfed [formerly f88a635a58]
Former-commit-id: bfa9d638cc
2013-12-02 17:10:10 -05:00
Slav Korolev
3dd96d0f33 Issue #2387. Added system status refresh.
Former-commit-id: b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly b9fa6d3622 [formerly b6a1724218] [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly 1be43bc76c [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 4a2e195ea2 [formerly 3dc318418e] [formerly 7af8f0fd5e64f264ed562426f6db9723c7967a2d [formerly 5e225387fd]]
Former-commit-id: 34f372bd245e24be00060583c2d67605fee315d9 [formerly 20793f8784]
Former-commit-id: bfb25c50cc
2013-12-02 16:14:45 -05:00
Ben Steffensmeier
92a64b540d Issue #2537 point data code cleanup.
Former-commit-id: 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 84dd9b10d6 [formerly 42107fba5c] [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly a4e3a4a03b [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]]
Former-commit-id: 7889c14b35
Former-commit-id: 65147cfb78 [formerly a4e3bf34b8] [formerly ad0bd85eb3b2bf617012e11ec19831b5f9d526eb [formerly 62ca7b1df6]]
Former-commit-id: bbabc5a7d5c61748932072b1206d0f441a38f98e [formerly 8c386a2aac]
Former-commit-id: b29fbe64a8
2013-11-26 15:16:54 -06:00