2714 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Roger Ferrel	40b73d902c	Issue #437 Added change status menu option. ... Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223 Former-commit-id: ced485f863 [formerly 69ea7c724e] [formerly 020be00301 [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]] Former-commit-id: 020be00301 Former-commit-id: 8fa193bcbe	2012-04-10 16:50:26 -05:00
Bryan Kowal	541fe8fbbb	Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features. ... Former-commit-id: b1a5abc6b3 [formerly 6ddeef48fa] [formerly ce99417a2a [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]] Former-commit-id: ce99417a2a Former-commit-id: 10a291afa1	2012-04-10 16:42:36 -05:00
James Korman	8afc2bc1a8	Issue #437 - Updates to status handling - Added SessionManager user presence. ... Former-commit-id: 44eae46180 [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]] Former-commit-id: 07bc1bf83e Former-commit-id: 7272ede3c4	2012-04-10 15:55:12 -05:00
Max Schenkelberg	9853d46099	Issue #239 Got zoom/pan events working for remote users ... Former-commit-id: 65f6c07530 [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly a817a720868fe887deca6ce6589014f0cd439c2d]] Former-commit-id: 18e9f2c6ad Former-commit-id: 0d21a9a35e	2012-04-10 14:40:51 -05:00
Matt Nash	96f45cdb58	Issue #429 comment out ability to start in debug mode for the connection ... Former-commit-id: 62564ebb0c [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]] Former-commit-id: f05b486e33 Former-commit-id: 52e27b63f7	2012-04-10 13:22:42 -05:00
Steve Harris	51bb9ebb46	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: c90ce9d54e [formerly ed26e06df2] [formerly fee53dea94 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]] Former-commit-id: fee53dea94 Former-commit-id: dcdd7f0648	2012-04-10 12:50:03 -05:00
Roger Ferrel	16857ccb3a	Issue #437 User status now properly displayed and updated in sessions. ... Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999 Former-commit-id: 7ebea1d964 [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]] Former-commit-id: 3fd25ff1cf Former-commit-id: 57e809d913	2012-04-10 11:11:26 -05:00
Nate Jensen	a16929c9bc	Issue #427 cleanup ... Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024 Former-commit-id: 68a3867d06 [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]] Former-commit-id: ec92c842c4 Former-commit-id: a924bd6489	2012-04-10 10:35:03 -05:00
Brad Gonzales	d7421465f7	Issue #440 Changed login icon to green. ... Former-commit-id: 0eefb140ac [formerly a378fea5d1] [formerly ca2a35d77c [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]] Former-commit-id: ca2a35d77c Former-commit-id: 8d170cd14b	2012-04-10 10:01:11 -05:00
Roger Ferrel	35c753c07f	Issue #437 Presence status sent out when logged on to the server. ... Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164 Former-commit-id: 57abf56e09 [formerly b4c8d3a0d9] [formerly 521127b589 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]] Former-commit-id: 521127b589 Former-commit-id: 946f7963c4	2012-04-09 16:00:25 -05:00
Matt Nash	1c93a3d702	Issue #429 changing 'private' aspect ... Former-commit-id: eba8ac8dd9 [formerly 9887678590] [formerly 98350f4ba5 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]] Former-commit-id: 98350f4ba5 Former-commit-id: d6731254d6	2012-04-09 15:21:07 -05:00
Roger Ferrel	7be7bceeaa	Issue #437 Change to up date Presence in the Group View. ... Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8 Former-commit-id: 225a8762d1 [formerly c5399687bc] [formerly 2109190752 [formerly b64a623cda4ec00d555d8542da496286e0210dac]] Former-commit-id: 2109190752 Former-commit-id: 1e4ed16880	2012-04-09 15:16:19 -05:00
Slav Korolev	45d4f9fb86	Issue #449. Fixed problem with simulated time for trend plots in FSS ... monitors. Former-commit-id: bf5cf6a903 [formerly 8d29726365] [formerly f02da69ff5 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]] Former-commit-id: f02da69ff5 Former-commit-id: 47ba302180	2012-04-09 14:50:19 -04:00
Bryan Kowal	ee210d909f	Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort. ... Former-commit-id: 898487c15c [formerly 94b327d00f] [formerly 2386dd5890 [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]] Former-commit-id: 2386dd5890 Former-commit-id: 5395b66d6e	2012-04-09 13:15:50 -05:00
Matt Nash	80da3ac38f	Issue #429 add resource data to ISerializableObject file to fix error ... Former-commit-id: 2a7698e284 [formerly 42ce0e72f0] [formerly b340718346 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]] Former-commit-id: b340718346 Former-commit-id: 22aec07dfd	2012-04-09 12:42:44 -05:00
James Korman	9a7c440f2d	Issue #437 - Updated Presence - Add properties and new constructor ... Former-commit-id: 9aa0176bb7 [formerly 48397d1d95] [formerly 53dc047d3d [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]] Former-commit-id: 53dc047d3d Former-commit-id: 0d6a5312d1	2012-04-09 11:42:19 -05:00
Brad Gonzales	8084909235	Issue #440 added login icon. Changed Logon to Login. ... Former-commit-id: 008b670b6a [formerly 44a83e92ed] [formerly 7937986b11 [formerly d2b9c7981006dad91c5781fe0df96113530491df]] Former-commit-id: 7937986b11 Former-commit-id: 552ce918ef	2012-04-09 11:38:08 -05:00
James Korman	5062cfd2a3	Issue #437 - Add code to update and post roster presence changes. ... Former-commit-id: 31a93f32ab [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]] Former-commit-id: df0cdcb563 Former-commit-id: f535049780	2012-04-09 10:01:55 -05:00
Bryan Kowal	ab70749ea4	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: f49aadd9c8 [formerly 1afa927c33] [formerly 839d7c886f [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]] Former-commit-id: 839d7c886f Former-commit-id: 24148c19a9	2012-04-09 09:32:45 -05:00
Bryan Kowal	774d05de1b	Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge ... Former-commit-id: 21ff4bf657 [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]] Former-commit-id: dcc3c7bb59 Former-commit-id: 240c3a1806	2012-04-09 09:19:02 -05:00
Max Schenkelberg	532f2d691b	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: a5fa19c914 [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]] Former-commit-id: 6812c1ba2b Former-commit-id: 824b24dfcb	2012-04-06 10:23:24 -05:00
Matt Nash	803d45adfe	Issue #429 remove unused com.raytheon.viz.drawing plugin ... Former-commit-id: 922fffeeed [formerly af0513690d] [formerly 5bd8e5e47c [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]] Former-commit-id: 5bd8e5e47c Former-commit-id: 437aa74095	2012-04-06 07:16:15 -05:00
Nate Jensen	c5130d8361	Issue #444 initial role transfer code and some cleanup ... Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f Former-commit-id: 28684fd160 [formerly c1543afc44] [formerly 0ef84129c4 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]] Former-commit-id: 0ef84129c4 Former-commit-id: ac109d3e72	2012-04-05 17:49:12 -05:00
David Gillingham	bef6e3d504	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: 5193184abf [formerly 87142f9f4e] [formerly e0e57577ff [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]] Former-commit-id: e0e57577ff Former-commit-id: 84f0765dba	2012-04-05 15:49:23 -05:00
Max Schenkelberg	20ad9fe872	Issue #239 Added remote capability injection code through factory ... method. Cleaned up old/unmaintained 3D references Former-commit-id: 48ca9ca105 [formerly 54aaf05209] [formerly 16056d53c5 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]] Former-commit-id: 16056d53c5 Former-commit-id: b4b754c7cc	2012-04-05 13:52:20 -05:00
Matt Nash	95f85cde78	Issue #429 alert of new messages when in background ... Former-commit-id: 5d0ae7ff9f [formerly d62a660e52] [formerly f314b2475d [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]] Former-commit-id: f314b2475d Former-commit-id: 7edacef530	2012-04-05 12:38:35 -05:00
Matt Nash	27c3cf3f38	Issue #429 clear,undo,redo ... Former-commit-id: 52c0508781 [formerly c53719be8a] [formerly 328d7e1287 [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]] Former-commit-id: 328d7e1287 Former-commit-id: 7dd1657774	2012-04-05 11:49:57 -05:00
Matt Nash	f985ddaa7e	Issue #429 telestrator allows all users to draw ... Former-commit-id: 916b8428e4 [formerly f200e37a36] [formerly 09c022bda8 [formerly ed59b0803da528f391db3c71aac1184581cc353d]] Former-commit-id: 09c022bda8 Former-commit-id: fd1b123912	2012-04-05 10:27:10 -05:00
Roger Ferrel	98c83d5322	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: d197ea6fd2 [formerly afc79a14f3] [formerly 72bf5460d7 [formerly 898e1a503af21abef70afc734924332e7de249ee]] Former-commit-id: 72bf5460d7 Former-commit-id: f9aa115a2b	2012-04-05 08:09:15 -05:00
Bryan Kowal	edb7431d0a	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: 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]] Former-commit-id: 2ed20e107d Former-commit-id: 5f4d6f600a	2012-04-04 18:29:13 -05:00
Nate Jensen	a20e542438	Issue #427 fixed subject ... Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70 Former-commit-id: d68efe319e [formerly b084156a30] [formerly 4999e547a1 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]] Former-commit-id: 4999e547a1 Former-commit-id: 477d1bb013	2012-04-04 17:06:00 -05:00
Bradley Gonzales	2d7e2b456e	Issue #440 more descriptive login failure message ... Former-commit-id: 391f8e4d58 [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]] Former-commit-id: 74ce6f2140 Former-commit-id: c345b2614e	2012-04-04 16:26:58 -05:00
Nate Jensen	a2d7bdb709	Issue #427 instantiate collaboration resource ... Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20 Former-commit-id: 9c4b29c3aa [formerly 260c7c10eb] [formerly f06338bcd4 [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]] Former-commit-id: f06338bcd4 Former-commit-id: 0f5b0f7e9e	2012-04-04 14:05:12 -05:00
James Korman	9c924ccb25	Issue #437 - Corrected venue command message loopback ... Former-commit-id: fad1fa7362 [formerly 23a2cd033a] [formerly e663a9e5dc [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]] Former-commit-id: e663a9e5dc Former-commit-id: 44b07395fb	2012-04-04 13:41:25 -05:00
Matt Nash	a7544fadf9	Issue #429 working telestration collaboration capabilities ... Former-commit-id: 86e2f1a7ad [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]] Former-commit-id: c27a3cf672 Former-commit-id: 28df06150e	2012-04-04 11:23:34 -05:00
Roger Ferrel	d1ce0844e3	Issue #244 Fix bug in handleInvitationEvent ... Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9 Former-commit-id: 7aa926028e [formerly a39475e04d] [formerly 46ddf008b8 [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]] Former-commit-id: 46ddf008b8 Former-commit-id: 5145bb9e7e	2012-04-03 17:28:27 -05:00
James Korman	2307245201	Issue #437 - Adding roster api message handling. ... Former-commit-id: dcdb98319d [formerly 4c7f2465fc] [formerly afeea4d9d2 [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]] Former-commit-id: afeea4d9d2 Former-commit-id: f496523681	2012-04-03 16:57:27 -05:00
Roger Ferrel	06b9147bd2	Issue #244 Change user status now send Presence update to the server. ... Change-Id: Id0a455633693db251d03a85343f526905a9c4364 Former-commit-id: 3d9fcb3273 [formerly 78502719e9] [formerly 46addc13cf [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]] Former-commit-id: 46addc13cf Former-commit-id: 7cf6e6166d	2012-04-03 16:20:07 -05:00
Roger Ferrel	4b49ba50a7	Merge branch 'new_devel' into 11-Collaboration ... Former-commit-id: 6ae33324f3 [formerly b8df9f46e4] [formerly 395ae5ae63 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]] Former-commit-id: 395ae5ae63 Former-commit-id: 5b943096c5	2012-04-03 15:29:53 -05:00
Max Schenkelberg	3b9699d896	Issue #239 Start of remote target capabilities ... Former-commit-id: ac1fc79f5b [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]] Former-commit-id: d2d03e2c64 Former-commit-id: 5d7e504e89	2012-04-03 15:11:20 -05:00
David Gillingham	4ff79099ac	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: c9d5823d2c [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]] Former-commit-id: e0e8e6d00a Former-commit-id: b4439bc5e8	2012-04-03 14:16:33 -05:00
Roger Ferrel	034540cb01	Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. ... Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681 Former-commit-id: 1db237e408 [formerly 7d7ee81855] [formerly 9dd257f28a [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]] Former-commit-id: 9dd257f28a Former-commit-id: 813e91d1cc	2012-04-03 13:28:40 -05:00
Max Schenkelberg	52d1d31d7b	Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration ... Former-commit-id: ccde60b87e [formerly e78aad4bc5] [formerly 138114e3dc [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]] Former-commit-id: 138114e3dc Former-commit-id: bdc8c572a5	2012-04-03 13:15:31 -05:00
James Korman	f86eef9ef6	Issue #232 - Corrected problem using participant identifiers ... Former-commit-id: 9387e6154c [formerly b89a89def3] [formerly 96cd7bea11 [formerly 5b102692838b42ffab97186742338494df78b978]] Former-commit-id: 96cd7bea11 Former-commit-id: 46a646f7f7	2012-04-03 12:45:00 -05:00
Matt Nash	f11fcc7d8e	#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: 217d707198 [formerly 5cb40430a7] [formerly 8e16194370 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]] Former-commit-id: 8e16194370 Former-commit-id: ce79d3bec3	2012-04-03 12:23:11 -05:00
Nate Jensen	b740924cdc	Issue #427 open editor when joining session ... Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59 Former-commit-id: 19bb87346c [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]] Former-commit-id: c29a5a75d9 Former-commit-id: 6319166680	2012-04-03 08:44:58 -05:00
Max Schenkelberg	c7165384f1	Merge branch 'ss_sync (12.3.1)' into 11-Collaboration ... Former-commit-id: c56707c6bc [formerly 23d65caf2e] [formerly 753de872e0 [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]] Former-commit-id: 753de872e0 Former-commit-id: e3477c90ae	2012-04-02 16:15:21 -05:00
Roger Ferrel	63bfc3a073	Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum. ... Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2 Former-commit-id: 6aa7fb3d65 [formerly 146a421ccb] [formerly dbec72645a [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]] Former-commit-id: dbec72645a Former-commit-id: bd37fffbeb	2012-04-02 12:13:26 -05:00
Matt Nash	5e3bebc033	Issue #429 fix minor issues with toolbar and updated eraser code ... Former-commit-id: 25a539a1c8 [formerly 27e850d203] [formerly 236ae6f26c [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]] Former-commit-id: 236ae6f26c Former-commit-id: 0a97f20f3a	2012-03-30 16:35:02 -05:00
Roger Ferrel	a8b643dc2a	Issue #244 Active Sessions node only displays rooms the user is in. ... Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4 Former-commit-id: fac1db8b37 [formerly 442500aeae] [formerly 232df64e22 [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]] Former-commit-id: 232df64e22 Former-commit-id: 21b19df9db	2012-03-30 15:06:35 -05:00