Commit graph

3850 commits

Author SHA1 Message Date
Brad Gonzales
2a405eb253 Issue #443 added optional jaxb and thrift compression to collaboration, Tools.java.
Former-commit-id: b07cd0c2157e72d679d76ec54987b2de41c10aae
2012-04-11 18:34:58 -05:00
Matt Nash
b707408a0a Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: fa78aa2f7f4738770b37beb6b02fe5adbb074fae
2012-04-11 16:45:28 -05:00
James Korman
14b193ad6f Issue #437 - Add debug output to support roster development
Former-commit-id: b502e55a4b95dc0483e5502154ba61f04e9132cc
2012-04-11 16:23:04 -05:00
James Korman
f25744ed0f Issue #437 - Added event notification for roster/roster status updates
Former-commit-id: 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8
2012-04-11 15:37:16 -05:00
Roger Ferrel
d45396d9f0 Issue #437 Bug fixes to user status
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f

Former-commit-id: 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a
2012-04-11 12:26:46 -05:00
Max Schenkelberg
ea6b58c226 Issue #239 Got maps resources syncing across users
Former-commit-id: d3864aaf812ed78137a7c4124515a1f4300cd2b1
2012-04-11 09:46:53 -05:00
Nate Jensen
f32611df47 Issue #444 some cleanup
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916

Former-commit-id: 7731d22c58ee05a1c663a1d0da8f047ce49aa09c
2012-04-11 09:33:56 -05:00
Nate Jensen
9b4b691ca9 Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7

Former-commit-id: 4aa478bd573ad7d9a801658c37a1d229d7bf5862
2012-04-10 18:15:36 -05:00
Bryan Kowal
3baf9d03c2 Merge "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." into 11-Collaboration
Former-commit-id: b1420977f92e3b5b206f33ce2e1275aee53cc2ae
2012-04-10 17:40:58 -05:00
Brad Gonzales
107c8ba7b9 Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7
2012-04-10 17:20:38 -05:00
Roger Ferrel
020be00301 Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: 82ae4e9433e71e9027566aed4595046ce0ef6dfa
2012-04-10 16:50:26 -05:00
Bryan Kowal
ce99417a2a 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: b6c8b811ad911f13503859f7af09b916eb16a1d4
2012-04-10 16:42:36 -05:00
James Korman
07bc1bf83e Issue #437 - Updates to status handling - Added SessionManager user presence.
Former-commit-id: 77520e5b98de679a1f08b523fb85464a31bd4c02
2012-04-10 15:55:12 -05:00
Max Schenkelberg
18e9f2c6ad Issue #239 Got zoom/pan events working for remote users
Former-commit-id: a817a720868fe887deca6ce6589014f0cd439c2d
2012-04-10 14:40:51 -05:00
Matt Nash
f05b486e33 Issue #429 comment out ability to start in debug mode for the connection
Former-commit-id: 8293c897e3b11c026b2f07eb45e72f48897f8d9f
2012-04-10 13:22:42 -05:00
Steve Harris
fee53dea94 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: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
2012-04-10 12:50:03 -05:00
Roger Ferrel
3fd25ff1cf Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3
2012-04-10 11:11:26 -05:00
Nate Jensen
ec92c842c4 Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 93a7d3b6f52331034efe1e02fdd073959eee56ee
2012-04-10 10:35:03 -05:00
Brad Gonzales
ca2a35d77c Issue #440 Changed login icon to green.
Former-commit-id: 69549e0e64ff8d14892db9e908692c47aeb3043c
2012-04-10 10:01:11 -05:00
Roger Ferrel
521127b589 Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 9391b95b6a26b34675370b3f7347fab4f08444e5
2012-04-09 16:00:25 -05:00
Matt Nash
98350f4ba5 Issue #429 changing 'private' aspect
Former-commit-id: 4c475ace9b0803b40bc90eca71a800a1ca2da4b5
2012-04-09 15:21:07 -05:00
Roger Ferrel
2109190752 Issue #437 Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: b64a623cda4ec00d555d8542da496286e0210dac
2012-04-09 15:16:19 -05:00
Slav Korolev
f02da69ff5 Issue #449. Fixed problem with simulated time for trend plots in FSS
monitors.

Former-commit-id: 79b81f2a734142d212d7bc0ad3686c7b64f433c5
2012-04-09 14:50:19 -04:00
Matt Nash
b340718346 Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: b8fc69fc6746566e83b19ed4dfa8611858332aac
2012-04-09 12:42:44 -05:00
James Korman
53dc047d3d Issue #437 - Updated Presence - Add properties and new constructor
Former-commit-id: 5f94c705fa50346aca0befcc8eca7b609e685719
2012-04-09 11:42:19 -05:00
Brad Gonzales
7937986b11 Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: d2b9c7981006dad91c5781fe0df96113530491df
2012-04-09 11:38:08 -05:00
James Korman
df0cdcb563 Issue #437 - Add code to update and post roster presence changes.
Former-commit-id: 8c5406eb39e9bd8590817e5eda854e20866ebbae
2012-04-09 10:01:55 -05:00
Max Schenkelberg
6812c1ba2b 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: c7badfd1c2a77d410cd3b841fef967c07c9e6434
2012-04-06 10:23:24 -05:00
Matt Nash
5bd8e5e47c Issue #429 remove unused com.raytheon.viz.drawing plugin
Former-commit-id: b02beff8d7beb6f33e5bcdcfb72a423d7f18584e
2012-04-06 07:16:15 -05:00
Nate Jensen
0ef84129c4 Issue #444 initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: c7276b7fddee718fd47f1f1b3fb75d5b483e62fc
2012-04-05 17:49:12 -05:00
Max Schenkelberg
16056d53c5 Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca
2012-04-05 13:52:20 -05:00
Matt Nash
f314b2475d Issue #429 alert of new messages when in background
Former-commit-id: 8e8fbe73b41f6457c085ab11939fdbd1242d4383
2012-04-05 12:38:35 -05:00
Matt Nash
328d7e1287 Issue #429 clear,undo,redo
Former-commit-id: 69fcd977767dec591f2132cc6b13f9e48a3180b0
2012-04-05 11:49:57 -05:00
Matt Nash
09c022bda8 Issue #429 telestrator allows all users to draw
Former-commit-id: ed59b0803da528f391db3c71aac1184581cc353d
2012-04-05 10:27:10 -05:00
Roger Ferrel
72bf5460d7 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: 898e1a503af21abef70afc734924332e7de249ee
2012-04-05 08:09:15 -05:00
Nate Jensen
4999e547a1 Issue #427 fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e
2012-04-04 17:06:00 -05:00
Bradley Gonzales
74ce6f2140 Issue #440 more descriptive login failure message
Former-commit-id: 909362d88423e3c5a39c73b5e5da2d2168f5ed91
2012-04-04 16:26:58 -05:00
Nate Jensen
f06338bcd4 Issue #427 instantiate collaboration resource
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: 5cd5a85bf836ade2da3b43b2797c2a65d61be461
2012-04-04 14:05:12 -05:00
James Korman
e663a9e5dc Issue #437 - Corrected venue command message loopback
Former-commit-id: c3ba8bd9416f18358f2a976ee2104e4e614321c3
2012-04-04 13:41:25 -05:00
Matt Nash
c27a3cf672 Issue #429 working telestration collaboration capabilities
Former-commit-id: f1c9552a757e7d194e31ed9786cb358c53e631b7
2012-04-04 11:23:34 -05:00
Roger Ferrel
46ddf008b8 Issue #244 Fix bug in handleInvitationEvent
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: 12e29dfb9e3a77e44b7b946f138c84e082e0990a
2012-04-03 17:28:27 -05:00
James Korman
afeea4d9d2 Issue #437 - Adding roster api message handling.
Former-commit-id: 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32
2012-04-03 16:57:27 -05:00
Roger Ferrel
46addc13cf Issue #244 Change user status now send Presence update to the server.
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b
2012-04-03 16:20:07 -05:00
Roger Ferrel
395ae5ae63 Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6
2012-04-03 15:29:53 -05:00
Max Schenkelberg
d2d03e2c64 Issue #239 Start of remote target capabilities
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
2012-04-03 15:11:20 -05:00
Roger Ferrel
9dd257f28a Issue #244 Peer to Peer chat implemented. Change Passwor implemtned.
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: dde6ebb7a4ce4cdee62b1d4e31d33694c331309e
2012-04-03 13:28:40 -05:00
Max Schenkelberg
138114e3dc Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7
2012-04-03 13:15:31 -05:00
James Korman
96cd7bea11 Issue #232 - Corrected problem using participant identifiers
Former-commit-id: 5b102692838b42ffab97186742338494df78b978
2012-04-03 12:45:00 -05:00
Matt Nash
8e16194370 #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: be35f7e75bbeb89fe160e24d9ff691f62753c96b
2012-04-03 12:23:11 -05:00
Nate Jensen
c29a5a75d9 Issue #427 open editor when joining session
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6
2012-04-03 08:44:58 -05:00