Commit graph

2950 commits

Author SHA1 Message Date
James Korman
8dde3a0798 Issue #232 - Added message routing/corrected roster creation
Former-commit-id: 6149d30b13 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]
Former-commit-id: b45ea1e0a7
2012-03-29 10:16:15 -05:00
Steve Harris
0665862abe Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: 70357d90bc
2012-03-29 10:03:05 -05:00
Steve Harris
94e6323c0a Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 54a1d9cdbc [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]
Former-commit-id: 132d68acc6
2012-03-29 10:01:55 -05:00
Nate Jensen
aaba32c4c1 Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: 676746126c [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]
Former-commit-id: cf880ddd0d
2012-03-28 15:10:34 -05:00
Matt Nash
b86ee8584f Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: 39670f6755 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]
Former-commit-id: d55dab5c34
2012-03-28 15:09:18 -05:00
Nate Jensen
40dd73ba4d Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: bbf96992ee [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]
Former-commit-id: 5fdc253d77
2012-03-28 14:34:25 -05:00
Max Schenkelberg
66eaffb9ee Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: f10f1a5319 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]
Former-commit-id: 15a9245592
2012-03-28 13:32:04 -05:00
Roger Ferrel
fae1527331 Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: dc2f3316e6 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]
Former-commit-id: 5d95a69f39
2012-03-28 11:23:51 -05:00
James Korman
fc99959e3c Issue #232 - Added addition peer-to-peer events
Former-commit-id: ae6eddcd68 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]
Former-commit-id: e8b23e3687
2012-03-27 16:31:26 -05:00
Nate Jensen
ab63accc61 Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad

Former-commit-id: 0f25c8ffa6 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]
Former-commit-id: fa8b5b3400
2012-03-27 09:56:46 -05:00
Nate Jensen
4180979cf4 Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 80500eec9c [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]
Former-commit-id: 89d7f5ec7e
2012-03-27 09:42:39 -05:00
Nate Jensen
fc5e53b1c2 Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: b2655debe8 [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]
Former-commit-id: c6e046f11e
2012-03-27 08:36:25 -05:00
Nate Jensen
4d32c5e078 Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: d09c8a9383 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]
Former-commit-id: d40b15acc2
2012-03-27 08:36:15 -05:00
Nate Jensen
4073ba7e7d Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: ed44b0d93f [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]
Former-commit-id: 978b76066c
2012-03-27 08:32:19 -05:00
Roger Ferrel
76f9c71d41 Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: d001287c94 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]
Former-commit-id: a270259553
2012-03-26 17:30:51 -05:00
Roger Ferrel
df5a2662ba Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662

Former-commit-id: 95d8d85fd0 [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]
Former-commit-id: b180f9b45e
2012-03-26 17:30:50 -05:00
James Korman
fc2bd8c666 Issue #232 - Added JAXB serialization support
Former-commit-id: 221a5a65b0 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]
Former-commit-id: 72e9c2eb52
2012-03-26 16:48:04 -05:00
Nate Jensen
ef03821455 Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: cbf105015f [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]
Former-commit-id: f6226a89d9
2012-03-26 16:37:44 -05:00
Nate Jensen
e24039ae5c Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: 2a1e40b2d5 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]
Former-commit-id: 7c6e0a41f7
2012-03-26 15:47:34 -05:00
Nate Jensen
bac31f3613 Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: 619d19e24c [formerly b752ced02d726771a6e11a9982967a892d2e55f3]
Former-commit-id: 4d7a53c583
2012-03-26 13:05:01 -05:00
James Korman
5bb4a7952b Issue #232 : Large refactor - Add command interfaces
Former-commit-id: d51a8521f8 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]
Former-commit-id: e408ed1a28
2012-03-26 10:17:17 -05:00
Roger Ferrel
cd66a9c29c Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: ce72b7b583 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]
Former-commit-id: 04b5a92838
2012-03-22 16:57:30 -05:00
Nate Jensen
37d4401747 Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 0e214bcd7c [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]
Former-commit-id: 615962f5dd
2012-03-22 09:39:59 -05:00
Bryan Kowal
5ba68624c5 Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 31f989ecb4 [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]
Former-commit-id: 8a4c883e0b
2012-03-21 16:49:38 -05:00
James Korman
4dabfd8c2a Issue #232 - Delete files from original locations
Former-commit-id: 55f269100c [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]
Former-commit-id: 90b74b258a
2012-03-20 14:55:27 -05:00
James Korman
60ff4d139b Issue #232 - Considerable refactoring/event processing
Former-commit-id: cc5cc2d409 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]
Former-commit-id: 4ba4ccb404
2012-03-20 13:59:55 -05:00
Roger Ferrel
ce3b5728c5 Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: a7f1fc18b1 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]
Former-commit-id: 1f4edd08e4
2012-03-20 10:42:57 -05:00
Greg Armendariz
9a0f313c23 Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
Former-commit-id: d45249fb2f [formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]
Former-commit-id: 65b8521ccb
2012-03-17 10:35:17 -05:00
Bryan Kowal
97cb8ab51c Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
Former-commit-id: 64cdd27f62 [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]
Former-commit-id: 55a759fb8a
2012-03-16 12:16:48 -05:00
Max Schenkelberg
468c812dde Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"

Former-commit-id: b9085db25d [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]
Former-commit-id: cd6ebd80d4
2012-03-16 10:13:31 -05:00
Max Schenkelberg
97edff9f7c Issue #358 Fixed sampling issue with mosaic resource with best
res resources

Former-commit-id: 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]
Former-commit-id: cc111ab9ac
2012-03-16 09:03:50 -05:00
Max Schenkelberg
10b720381b Issue #358 Fixed painting and sampling regression in radar mosaic due to
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]
Former-commit-id: 719f87c261
2012-03-14 18:03:44 -05:00
David Gillingham
e33083c11a Issue #20: Don't throw an exception if overriding a lower-localization
level's configuration (like overriding BASE's default plugin
configuration).

Former-commit-id: ed74b90589 [formerly b585768a8c7e3f42742efe5128ec6cb05c6424bf]
Former-commit-id: 13af9170b1
2012-03-14 15:07:59 -05:00
Nate Jensen
feeb8cba7e Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: dc62171533 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]
Former-commit-id: 8f8e690470
2012-03-14 11:23:55 -05:00
Matt Nash
f5c9cfd285 Issue #244 icons and login changes
Former-commit-id: 2fd6e28569 [formerly ef2993a8545265adbc325080765baef0ee939923]
Former-commit-id: e06101f9c3
2012-03-14 10:54:13 -05:00
James Korman
ee20250305 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]
Former-commit-id: 095ab0eeab
2012-03-14 10:24:17 -05:00
Max Schenkelberg
8fb7eccb73 Issue #358 Cleaned up mesh extension and API to use geotools for
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]
Former-commit-id: 6e5964df9d
2012-03-14 09:49:32 -05:00
Roger Ferrel
186aac5b77 Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: c321d2aacf [formerly 486b2186014a14a845e48dac222c293a7891e39e]
Former-commit-id: 97a3884017
2012-03-14 09:26:23 -05:00
David Gillingham
7e5ec12276 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: d433b7d4d6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]
Former-commit-id: e13850a2b6
2012-03-13 12:31:38 -05:00
Steve Harris
6d2af585b1 Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
Former-commit-id: 10dc140747 [formerly a8ca6db2b2df5f7bd8a6a2fec3496dc1f37aa20c]
Former-commit-id: 5bbf80a384
2012-03-12 13:10:34 -05:00
Bryan Kowal
eab9c845bb Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
Former-commit-id: 66e05f4c96 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]
Former-commit-id: 58bfa62981
2012-03-12 11:43:34 -05:00
Matt Nash
6398c01aec Issue #244 new icons for collaboration
Former-commit-id: 39bce3d793 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]
Former-commit-id: 79f1cbec74
2012-03-12 08:03:54 -05:00
Max Schenkelberg
18805c68f7 Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]
Former-commit-id: d43b0456d8
2012-03-09 12:31:50 -06:00
Roger Ferrel
1871be89e7 Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: d17ef23899 [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]
Former-commit-id: be9fe19d9a
2012-03-08 17:16:48 -06:00
Roger Ferrel
71a5524380 Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: f04f775a66 [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]
Former-commit-id: f492b082dc
2012-03-08 12:37:56 -06:00
Matt Nash
c96c33169b Issue #244 added work on the chat for presence notifications
Former-commit-id: 6f354374d6 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]
Former-commit-id: d264743199
2012-03-08 09:08:41 -06:00
Bryan Kowal
5838ff71f1 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: b871752e3a [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]
Former-commit-id: fc1ca4efcc
2012-03-08 09:00:55 -06:00
Matt Nash
1e4472cd78 Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: bbacd337b4 [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]
Former-commit-id: 04ae9b48ea
2012-03-08 08:33:32 -06:00
Roger Ferrel
c22d5ef573 Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: 2114b95a0b [formerly 28969960d80066def0ef02930875e40d7693c234]
Former-commit-id: c9459e2e8c
2012-03-08 08:30:02 -06:00
David Gillingham
15a9e7cdae Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: 78c7f29096 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]
Former-commit-id: 90a745a037
2012-03-07 16:05:54 -06:00