Matt Nash
96f45cdb58
Issue #429 comment out ability to start in debug mode for the connection
...
Former-commit-id: 62564ebb0c202fe2bb5ef05b486e33f05b486e3352e27b63f7
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: c90ce9d54eed26e06df2fee53dea94fee53dea94dcdd7f0648
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: 7ebea1d964d2e2fd8da33fd25ff1cf3fd25ff1cf57e809d913
2012-04-10 11:11:26 -05:00
Nate Jensen
a16929c9bc
Issue #427 cleanup
...
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024
Former-commit-id: 68a3867d062e5272cff9ec92c842c4ec92c842c4a924bd6489
2012-04-10 10:35:03 -05:00
Brad Gonzales
d7421465f7
Issue #440 Changed login icon to green.
...
Former-commit-id: 0eefb140aca378fea5d1ca2a35d77cca2a35d77c8d170cd14b
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: 57abf56e09b4c8d3a0d9521127b589521127b589946f7963c4
2012-04-09 16:00:25 -05:00
Matt Nash
1c93a3d702
Issue #429 changing 'private' aspect
...
Former-commit-id: eba8ac8dd9988767859098350f4ba598350f4ba5d6731254d6
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: 225a8762d1c5399687bc210919075221091907521e4ed16880
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: bf5cf6a9038d29726365f02da69ff5f02da69ff547ba302180
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: 898487c15c94b327d00f2386dd58902386dd58905395b66d6e
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: 2a7698e28442ce0e72f0b340718346b34071834622aec07dfd
2012-04-09 12:42:44 -05:00
James Korman
9a7c440f2d
Issue #437 - Updated Presence - Add properties and new constructor
...
Former-commit-id: 9aa0176bb748397d1d9553dc047d3d53dc047d3d0d6a5312d1
2012-04-09 11:42:19 -05:00
Brad Gonzales
8084909235
Issue #440 added login icon. Changed Logon to Login.
...
Former-commit-id: 008b670b6a44a83e92ed7937986b117937986b11552ce918ef
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: 31a93f32abbb31e9e2eadf0cdcb563df0cdcb563f535049780
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: f49aadd9c81afa927c33839d7c886f839d7c886f24148c19a9
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: 21ff4bf657f1e81b1a95dcc3c7bb59dcc3c7bb59240c3a1806
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: a5fa19c914cbe92bdf326812c1ba2b6812c1ba2b824b24dfcb
2012-04-06 10:23:24 -05:00
Matt Nash
803d45adfe
Issue #429 remove unused com.raytheon.viz.drawing plugin
...
Former-commit-id: 922fffeeedaf0513690d5bd8e5e47c5bd8e5e47c437aa74095
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: 28684fd160c1543afc440ef84129c40ef84129c4ac109d3e72
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: 5193184abf87142f9f4ee0e57577ffe0e57577ff84f0765dba
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: 48ca9ca10554aaf0520916056d53c516056d53c5b4b754c7cc
2012-04-05 13:52:20 -05:00
Matt Nash
95f85cde78
Issue #429 alert of new messages when in background
...
Former-commit-id: 5d0ae7ff9fd62a660e52f314b2475df314b2475d7edacef530
2012-04-05 12:38:35 -05:00
Matt Nash
27c3cf3f38
Issue #429 clear,undo,redo
...
Former-commit-id: 52c0508781c53719be8a328d7e1287328d7e12877dd1657774
2012-04-05 11:49:57 -05:00
Matt Nash
f985ddaa7e
Issue #429 telestrator allows all users to draw
...
Former-commit-id: 916b8428e4f200e37a3609c022bda809c022bda8fd1b123912
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: d197ea6fd2afc79a14f372bf5460d772bf5460d7f9aa115a2b
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: 3e039dc79fe792b2a16f2ed20e107d2ed20e107d5f4d6f600a
2012-04-04 18:29:13 -05:00
Nate Jensen
a20e542438
Issue #427 fixed subject
...
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70
Former-commit-id: d68efe319eb084156a304999e547a14999e547a1477d1bb013
2012-04-04 17:06:00 -05:00
Bradley Gonzales
2d7e2b456e
Issue #440 more descriptive login failure message
...
Former-commit-id: 391f8e4d586fc14461ee74ce6f214074ce6f2140c345b2614e
2012-04-04 16:26:58 -05:00
Nate Jensen
a2d7bdb709
Issue #427 instantiate collaboration resource
...
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20
Former-commit-id: 9c4b29c3aa260c7c10ebf06338bcd4f06338bcd40f5b0f7e9e
2012-04-04 14:05:12 -05:00
James Korman
9c924ccb25
Issue #437 - Corrected venue command message loopback
...
Former-commit-id: fad1fa736223a2cd033ae663a9e5dce663a9e5dc44b07395fb
2012-04-04 13:41:25 -05:00
Matt Nash
a7544fadf9
Issue #429 working telestration collaboration capabilities
...
Former-commit-id: 86e2f1a7ad3c2fcc59d0c27a3cf672c27a3cf67228df06150e
2012-04-04 11:23:34 -05:00
Roger Ferrel
d1ce0844e3
Issue #244 Fix bug in handleInvitationEvent
...
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9
Former-commit-id: 7aa926028ea39475e04d46ddf008b846ddf008b85145bb9e7e
2012-04-03 17:28:27 -05:00
James Korman
2307245201
Issue #437 - Adding roster api message handling.
...
Former-commit-id: dcdb98319d4c7f2465fcafeea4d9d2afeea4d9d2f496523681
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: 3d9fcb327378502719e946addc13cf46addc13cf7cf6e6166d
2012-04-03 16:20:07 -05:00
Roger Ferrel
4b49ba50a7
Merge branch 'new_devel' into 11-Collaboration
...
Former-commit-id: 6ae33324f3b8df9f46e4395ae5ae63395ae5ae635b943096c5
2012-04-03 15:29:53 -05:00
Max Schenkelberg
3b9699d896
Issue #239 Start of remote target capabilities
...
Former-commit-id: ac1fc79f5b6c411ffb07d2d03e2c64d2d03e2c645d7e504e89
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: c9d5823d2ca9398fe4cde0e8e6d00ae0e8e6d00ab4439bc5e8
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: 1db237e4087d7ee818559dd257f28a9dd257f28a813e91d1cc
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: ccde60b87ee78aad4bc5138114e3dc138114e3dcbdc8c572a5
2012-04-03 13:15:31 -05:00
James Korman
f86eef9ef6
Issue #232 - Corrected problem using participant identifiers
...
Former-commit-id: 9387e6154cb89a89def396cd7bea1196cd7bea1146a646f7f7
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: 217d7071985cb40430a78e161943708e16194370ce79d3bec3
2012-04-03 12:23:11 -05:00
Nate Jensen
b740924cdc
Issue #427 open editor when joining session
...
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59
Former-commit-id: 19bb87346c223eb82fe0c29a5a75d9c29a5a75d96319166680
2012-04-03 08:44:58 -05:00
Max Schenkelberg
c7165384f1
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: c56707c6bc23d65caf2e753de872e0753de872e0e3477c90ae
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: 6aa7fb3d65146a421ccbdbec72645adbec72645abd37fffbeb
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: 25a539a1c827e850d203236ae6f26c236ae6f26c0a97f20f3a
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: fac1db8b37442500aeae232df64e22232df64e2221b19df9db
2012-03-30 15:06:35 -05:00
James Korman
ae115263ce
Issue #232 - Modified invitation methods
...
Former-commit-id: a907eeb4ed436b967ff10b6a0761290b6a07612948fb9fe7e4
2012-03-30 11:27:09 -05:00
Max Schenkelberg
4234b91d5b
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 74458bfb739b0d01f8b507cf5069ba07cf5069ba993cac891e
2012-03-30 10:51:31 -05:00
Roger Ferrel
d3a8343de0
Issue #244 Send and accept invites now works.
...
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148
Former-commit-id: dc50eb06d722fff3a4b8108ac66214108ac662141fd4aa5cf3
2012-03-30 10:45:26 -05:00
Steve Harris
9845ef53f9
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: a4e4792bb5d3ad6095b75cdda77afb5cdda77afb6aa18f74f6
2012-03-30 09:50:48 -05:00
