2362 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Korman	64313163fb	Issue #437 - Updates to status handling - Added SessionManager user presence. ... Former-commit-id: 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]] Former-commit-id: 7bf01ecbc9 Former-commit-id: 44eae46180	2012-04-10 15:55:12 -05:00
Max Schenkelberg	7416bd9839	Issue #239 Got zoom/pan events working for remote users ... Former-commit-id: 18e9f2c6ad [formerly 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]] Former-commit-id: 6e0c5c3cdf Former-commit-id: 65f6c07530	2012-04-10 14:40:51 -05:00
Matt Nash	286b51b936	Issue #429 comment out ability to start in debug mode for the connection ... Former-commit-id: f05b486e33 [formerly 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]] Former-commit-id: 202fe2bb5e Former-commit-id: 62564ebb0c	2012-04-10 13:22:42 -05:00
Steve Harris	6a1f2160bd	Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge ... Conflicts: edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java Former-commit-id: fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: ed26e06df2 Former-commit-id: c90ce9d54e	2012-04-10 12:50:03 -05:00
Roger Ferrel	9e4ea5bef6	Issue #437 User status now properly displayed and updated in sessions. ... Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999 Former-commit-id: 3fd25ff1cf [formerly d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]] Former-commit-id: d2e2fd8da3 Former-commit-id: 7ebea1d964	2012-04-10 11:11:26 -05:00
Nate Jensen	914012521e	Issue #427 cleanup ... Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024 Former-commit-id: ec92c842c4 [formerly 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]] Former-commit-id: 2e5272cff9 Former-commit-id: 68a3867d06	2012-04-10 10:35:03 -05:00
Brad Gonzales	694c8d99ff	Issue #440 Changed login icon to green. ... Former-commit-id: ca2a35d77c [formerly a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]] Former-commit-id: a378fea5d1 Former-commit-id: 0eefb140ac	2012-04-10 10:01:11 -05:00
Roger Ferrel	05d20a70ea	Issue #437 Presence status sent out when logged on to the server. ... Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164 Former-commit-id: 521127b589 [formerly b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]] Former-commit-id: b4c8d3a0d9 Former-commit-id: 57abf56e09	2012-04-09 16:00:25 -05:00
Matt Nash	e94db84585	Issue #429 changing 'private' aspect ... Former-commit-id: 98350f4ba5 [formerly 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]] Former-commit-id: 9887678590 Former-commit-id: eba8ac8dd9	2012-04-09 15:21:07 -05:00
Roger Ferrel	61f3e1fb0e	Issue #437 Change to up date Presence in the Group View. ... Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8 Former-commit-id: 2109190752 [formerly c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]] Former-commit-id: c5399687bc Former-commit-id: 225a8762d1	2012-04-09 15:16:19 -05:00
Slav Korolev	273abf0ca5	Issue #449. Fixed problem with simulated time for trend plots in FSS ... monitors. Former-commit-id: f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]] Former-commit-id: 8d29726365 Former-commit-id: bf5cf6a903	2012-04-09 14:50:19 -04:00
Bryan Kowal	1e2c3602c2	Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort. ... Former-commit-id: 2386dd5890 [formerly 94b327d00f [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]] Former-commit-id: 94b327d00f Former-commit-id: 898487c15c	2012-04-09 13:15:50 -05:00
Matt Nash	47a24a20c2	Issue #429 add resource data to ISerializableObject file to fix error ... Former-commit-id: b340718346 [formerly 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]] Former-commit-id: 42ce0e72f0 Former-commit-id: 2a7698e284	2012-04-09 12:42:44 -05:00
James Korman	3e0929bc19	Issue #437 - Updated Presence - Add properties and new constructor ... Former-commit-id: 53dc047d3d [formerly 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]] Former-commit-id: 48397d1d95 Former-commit-id: 9aa0176bb7	2012-04-09 11:42:19 -05:00
Brad Gonzales	5a1970c902	Issue #440 added login icon. Changed Logon to Login. ... Former-commit-id: 7937986b11 [formerly 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]] Former-commit-id: 44a83e92ed Former-commit-id: 008b670b6a	2012-04-09 11:38:08 -05:00
James Korman	f631252562	Issue #437 - Add code to update and post roster presence changes. ... Former-commit-id: df0cdcb563 [formerly bb31e9e2ea [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]] Former-commit-id: bb31e9e2ea Former-commit-id: 31a93f32ab	2012-04-09 10:01:55 -05:00
Bryan Kowal	476ad5de1f	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source. ... Former-commit-id: 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]] Former-commit-id: 1afa927c33 Former-commit-id: f49aadd9c8	2012-04-09 09:32:45 -05:00
Bryan Kowal	4d73e617c8	Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge ... Former-commit-id: dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]] Former-commit-id: f1e81b1a95 Former-commit-id: 21ff4bf657	2012-04-09 09:19:02 -05:00
Max Schenkelberg	65e7184cc4	Issue #239 Fixed D2D context activation so as not to override important ... keys when a unrelated view is active such as Product Browser or Collaboration views. Former-commit-id: 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]] Former-commit-id: cbe92bdf32 Former-commit-id: a5fa19c914	2012-04-06 10:23:24 -05:00
Matt Nash	30c3a6b53c	Issue #429 remove unused com.raytheon.viz.drawing plugin ... Former-commit-id: 5bd8e5e47c [formerly af0513690d [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]] Former-commit-id: af0513690d Former-commit-id: 922fffeeed	2012-04-06 07:16:15 -05:00
Nate Jensen	e1fb02a18e	Issue #444 initial role transfer code and some cleanup ... Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f Former-commit-id: 0ef84129c4 [formerly c1543afc44 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]] Former-commit-id: c1543afc44 Former-commit-id: 28684fd160	2012-04-05 17:49:12 -05:00
David Gillingham	3b47db9541	Issue #435: Prevent NullPointerExceptions from being thrown when ... serializing AirepRecords and NcAirepRecords. Issue #435: Address peer review comments on previous change. Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac Former-commit-id: e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]] Former-commit-id: 87142f9f4e Former-commit-id: 5193184abf	2012-04-05 15:49:23 -05:00
Max Schenkelberg	e525c9c35d	Issue #239 Added remote capability injection code through factory ... method. Cleaned up old/unmaintained 3D references Former-commit-id: 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]] Former-commit-id: 54aaf05209 Former-commit-id: 48ca9ca105	2012-04-05 13:52:20 -05:00
Matt Nash	7e6c9ae5b2	Issue #429 alert of new messages when in background ... Former-commit-id: f314b2475d [formerly d62a660e52 [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]] Former-commit-id: d62a660e52 Former-commit-id: 5d0ae7ff9f	2012-04-05 12:38:35 -05:00
Matt Nash	ca62e2ef7f	Issue #429 clear,undo,redo ... Former-commit-id: 328d7e1287 [formerly c53719be8a [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]] Former-commit-id: c53719be8a Former-commit-id: 52c0508781	2012-04-05 11:49:57 -05:00
Matt Nash	31f63e0cd0	Issue #429 telestrator allows all users to draw ... Former-commit-id: 09c022bda8 [formerly f200e37a36 [formerly ed59b0803da528f391db3c71aac1184581cc353d]] Former-commit-id: f200e37a36 Former-commit-id: 916b8428e4	2012-04-05 10:27:10 -05:00
Roger Ferrel	85b6b8a196	Issue #439 added filter to prevent illegal characters in the session name. Also made changes to throw exceptions when creation fails. ... Change-Id: Ieb5fcbb433f8165d8cd711224dc095fe96e5162c Former-commit-id: 72bf5460d7 [formerly afc79a14f3 [formerly 898e1a503af21abef70afc734924332e7de249ee]] Former-commit-id: afc79a14f3 Former-commit-id: d197ea6fd2	2012-04-05 08:09:15 -05:00
Bryan Kowal	5f9463bc57	Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances. ... Former-commit-id: 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]] Former-commit-id: e792b2a16f Former-commit-id: 3e039dc79f	2012-04-04 18:29:13 -05:00
Nate Jensen	956c125095	Issue #427 fixed subject ... Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70 Former-commit-id: 4999e547a1 [formerly b084156a30 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]] Former-commit-id: b084156a30 Former-commit-id: d68efe319e	2012-04-04 17:06:00 -05:00
Bradley Gonzales	9d44aabf06	Issue #440 more descriptive login failure message ... Former-commit-id: 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]] Former-commit-id: 6fc14461ee Former-commit-id: 391f8e4d58	2012-04-04 16:26:58 -05:00
Nate Jensen	bea3b8fb0c	Issue #427 instantiate collaboration resource ... Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20 Former-commit-id: f06338bcd4 [formerly 260c7c10eb [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]] Former-commit-id: 260c7c10eb Former-commit-id: 9c4b29c3aa	2012-04-04 14:05:12 -05:00
James Korman	47c16c8eda	Issue #437 - Corrected venue command message loopback ... Former-commit-id: e663a9e5dc [formerly 23a2cd033a [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]] Former-commit-id: 23a2cd033a Former-commit-id: fad1fa7362	2012-04-04 13:41:25 -05:00
Matt Nash	cb909ce21f	Issue #429 working telestration collaboration capabilities ... Former-commit-id: c27a3cf672 [formerly 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]] Former-commit-id: 3c2fcc59d0 Former-commit-id: 86e2f1a7ad	2012-04-04 11:23:34 -05:00
Roger Ferrel	c2b5a62e38	Issue #244 Fix bug in handleInvitationEvent ... Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9 Former-commit-id: 46ddf008b8 [formerly a39475e04d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]] Former-commit-id: a39475e04d Former-commit-id: 7aa926028e	2012-04-03 17:28:27 -05:00
James Korman	ffa4d5377f	Issue #437 - Adding roster api message handling. ... Former-commit-id: afeea4d9d2 [formerly 4c7f2465fc [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]] Former-commit-id: 4c7f2465fc Former-commit-id: dcdb98319d	2012-04-03 16:57:27 -05:00
Roger Ferrel	7cc492b43c	Issue #244 Change user status now send Presence update to the server. ... Change-Id: Id0a455633693db251d03a85343f526905a9c4364 Former-commit-id: 46addc13cf [formerly 78502719e9 [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]] Former-commit-id: 78502719e9 Former-commit-id: 3d9fcb3273	2012-04-03 16:20:07 -05:00
Roger Ferrel	ea093e60c2	Merge branch 'new_devel' into 11-Collaboration ... Former-commit-id: 395ae5ae63 [formerly b8df9f46e4 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]] Former-commit-id: b8df9f46e4 Former-commit-id: 6ae33324f3	2012-04-03 15:29:53 -05:00
Max Schenkelberg	6e94ff6098	Issue #239 Start of remote target capabilities ... Former-commit-id: d2d03e2c64 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]] Former-commit-id: 6c411ffb07 Former-commit-id: ac1fc79f5b	2012-04-03 15:11:20 -05:00
David Gillingham	ae703513d7	Issue #435: Ensure associated HDF5 data is always captured when ... archiving PDOs, alter binlightning so insert time is based on system time like all other plugins. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time. Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2 Former-commit-id: e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]] Former-commit-id: a9398fe4cd Former-commit-id: c9d5823d2c	2012-04-03 14:16:33 -05:00
Roger Ferrel	ce37b8ff40	Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. ... Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681 Former-commit-id: 9dd257f28a [formerly 7d7ee81855 [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]] Former-commit-id: 7d7ee81855 Former-commit-id: 1db237e408	2012-04-03 13:28:40 -05:00
Max Schenkelberg	6a3162d5b8	Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration ... Former-commit-id: 138114e3dc [formerly e78aad4bc5 [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]] Former-commit-id: e78aad4bc5 Former-commit-id: ccde60b87e	2012-04-03 13:15:31 -05:00
James Korman	32d9bac2c5	Issue #232 - Corrected problem using participant identifiers ... Former-commit-id: 96cd7bea11 [formerly b89a89def3 [formerly 5b102692838b42ffab97186742338494df78b978]] Former-commit-id: b89a89def3 Former-commit-id: 9387e6154c	2012-04-03 12:45:00 -05:00
Matt Nash	efea51faca	#429 fix issue where dialog prevents collaboration view from opening, add collaboration drawing layer, use event bus for message handling, prep work for ... Former-commit-id: 8e16194370 [formerly 5cb40430a7 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]] Former-commit-id: 5cb40430a7 Former-commit-id: 217d707198	2012-04-03 12:23:11 -05:00
Nate Jensen	d75858ffa0	Issue #427 open editor when joining session ... Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59 Former-commit-id: c29a5a75d9 [formerly 223eb82fe0 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]] Former-commit-id: 223eb82fe0 Former-commit-id: 19bb87346c	2012-04-03 08:44:58 -05:00
Max Schenkelberg	0b1caa67df	Merge branch 'ss_sync (12.3.1)' into 11-Collaboration ... Former-commit-id: 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]] Former-commit-id: 23d65caf2e Former-commit-id: c56707c6bc	2012-04-02 16:15:21 -05:00
Roger Ferrel	f03f683fd1	Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum. ... Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2 Former-commit-id: dbec72645a [formerly 146a421ccb [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]] Former-commit-id: 146a421ccb Former-commit-id: 6aa7fb3d65	2012-04-02 12:13:26 -05:00
Matt Nash	48eb644d69	Issue #429 fix minor issues with toolbar and updated eraser code ... Former-commit-id: 236ae6f26c [formerly 27e850d203 [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]] Former-commit-id: 27e850d203 Former-commit-id: 25a539a1c8	2012-03-30 16:35:02 -05:00
Roger Ferrel	d0b78dff9e	Issue #244 Active Sessions node only displays rooms the user is in. ... Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4 Former-commit-id: 232df64e22 [formerly 442500aeae [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]] Former-commit-id: 442500aeae Former-commit-id: fac1db8b37	2012-03-30 15:06:35 -05:00
James Korman	80ea4c0104	Issue #232 - Modified invitation methods ... Former-commit-id: 0b6a076129 [formerly 436b967ff1 [formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]] Former-commit-id: 436b967ff1 Former-commit-id: a907eeb4ed	2012-03-30 11:27:09 -05:00
Max Schenkelberg	25cf44a674	Issue #358 Fixed merge errors when merging core_exp into ss_sync ... Former-commit-id: 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]] Former-commit-id: 9b0d01f8b5 Former-commit-id: 74458bfb73	2012-03-30 10:51:31 -05:00