xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2563 fixed room id creation" into development

Browse source 
Former-commit-id: 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly 701efd5de9 [formerly 537dc6c8cc] [formerly cbad156c05] [formerly a8e9db0dde [formerly cbad156c05 [formerly a5d7f0a46a5304defe6ebde0b73418c0da168437]]]]
Former-commit-id: a8e9db0dde
Former-commit-id: 02a60c86ff [formerly 432a89c0fc] [formerly 1b9b5174b8f31578073feb91a2f11b6ec67ff985 [formerly 5beb950218]]
Former-commit-id: 1a26549f50f0eeaa529e2a9fcd041f74f6fdaecc [formerly 93e15999b3]
Former-commit-id: cf5ca32b8a
This commit is contained in:
Nate Jensen 2014-01-07 13:50:41 -06:00 • committed by Gerrit Code Review
commit bf9e58c6ea
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/AccountManager.java
View file

@ -37,6 +37,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.ISession;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession; import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.roster.ISubscriptionResponder; import com.raytheon.uf.viz.collaboration.comm.identity.roster.ISubscriptionResponder;
import com.raytheon.uf.viz.collaboration.comm.provider.event.UserPresenceChangedEvent; import com.raytheon.uf.viz.collaboration.comm.provider.event.UserPresenceChangedEvent;
import com.raytheon.uf.viz.collaboration.comm.provider.user.IDConverter;
import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId; import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
/** /**
@ -56,6 +57,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 16, 2012 jkorman Initial creation * Mar 16, 2012 jkorman Initial creation
* Dec 6, 2013 2561 bclement removed ECF * Dec 6, 2013 2561 bclement removed ECF
* Jan 07, 2013 2563 bclement fixed id parsing in auto responder
* *
* </pre> * </pre>
* *
@ -77,8 +79,7 @@ public class AccountManager implements IAccountManager {
if (type == null) { if (type == null) {
return; return;
} }
UserId fromId = new UserId(pres.getFrom(), sessionManager UserId fromId = IDConverter.convertFrom(pres.getFrom());
.getXmppConnection().getHost());
switch (type) { switch (type) {
case subscribe: case subscribe:
handleSubRequest(fromId); handleSubRequest(fromId);

4
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/CollaborationConnection.java
View file

@ -106,6 +106,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.VenueId;
* Dec 18, 2013 2562 bclement added smack compression, fixed invite parsing * Dec 18, 2013 2562 bclement added smack compression, fixed invite parsing
* Dec 19, 2013 2563 bclement added connection listener, * Dec 19, 2013 2563 bclement added connection listener,
* added better error message on failed connection * added better error message on failed connection
* Jan 07, 2013 2563 bclement use getServiceName instead of getHost when creating room id
* *
* </pre> * </pre>
* *
@ -452,7 +453,8 @@ public class CollaborationConnection implements IEventPublisher {
* @return false on error * @return false on error
*/ */
public boolean venueExistsOnServer(String venueName) { public boolean venueExistsOnServer(String venueName) {
String roomId = VenueSession.getRoomId(connection.getHost(), venueName); String roomId = VenueSession.getRoomId(connection.getServiceName(),
venueName);
try { try {
return VenueSession.roomExistsOnServer(connection, roomId); return VenueSession.roomExistsOnServer(connection, roomId);
} catch (XMPPException e) { } catch (XMPPException e) {

5
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java
View file

@ -87,6 +87,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
* Dec 6, 2013 2561 bclement removed ECF * Dec 6, 2013 2561 bclement removed ECF
* Dec 18, 2013 2562 bclement moved data to packet extension * Dec 18, 2013 2562 bclement moved data to packet extension
* Dec 19, 2013 2563 bclement status listeners now send all events to bus * Dec 19, 2013 2563 bclement status listeners now send all events to bus
* Jan 07, 2013 2563 bclement use getServiceName instead of getHost when creating room id
* *
* </pre> * </pre>
* *
@ -255,7 +256,7 @@ public class VenueSession extends BaseSession implements IVenueSession {
throws CollaborationException { throws CollaborationException {
CollaborationConnection manager = getSessionManager(); CollaborationConnection manager = getSessionManager();
XMPPConnection conn = manager.getXmppConnection(); XMPPConnection conn = manager.getXmppConnection();
String roomId = getRoomId(conn.getHost(), venueName); String roomId = getRoomId(conn.getServiceName(), venueName);
this.muc = new MultiUserChat(conn, roomId); this.muc = new MultiUserChat(conn, roomId);
this.venue = new Venue(conn, muc); this.venue = new Venue(conn, muc);
createListeners(); createListeners();
@ -287,7 +288,7 @@ public class VenueSession extends BaseSession implements IVenueSession {
try { try {
CollaborationConnection manager = getSessionManager(); CollaborationConnection manager = getSessionManager();
XMPPConnection conn = manager.getXmppConnection(); XMPPConnection conn = manager.getXmppConnection();
String roomId = getRoomId(conn.getHost(), venueName); String roomId = getRoomId(conn.getServiceName(), venueName);
if (roomExistsOnServer(conn, roomId)) { if (roomExistsOnServer(conn, roomId)) {
throw new CollaborationException("Session name already in use"); throw new CollaborationException("Session name already in use");
} }