From 266eef93fa0676516e9922dcec327f1c379a37f5 Mon Sep 17 00:00:00 2001 From: James Korman Date: Tue, 20 Mar 2012 14:55:27 -0500 Subject: [PATCH] Issue #232 - Delete files from original locations Former-commit-id: 9c17874f377dd0248f2eb663996296103e4ddcd1 [formerly 4dabfd8c2a61012f8a0925c106717f9b5ba49726] [formerly 90b74b258a11ff51caca53d51bc69836ede4a784] [formerly 9c17874f377dd0248f2eb663996296103e4ddcd1 [formerly 4dabfd8c2a61012f8a0925c106717f9b5ba49726] [formerly 90b74b258a11ff51caca53d51bc69836ede4a784] [formerly 55f269100c3d6e63905cf70477a69bcf9369f11c [formerly 90b74b258a11ff51caca53d51bc69836ede4a784 [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]] Former-commit-id: 55f269100c3d6e63905cf70477a69bcf9369f11c Former-commit-id: ef3fdd7171f196030e419c995084697db5668c9d [formerly d0976e4703f26124d255b78b171ea75d7f25c20f] [formerly 4d86c3e4eddb68e0dd4e867b58d0cb40e7d9c96c [formerly 9badd0fb07413612cde09ef59d7e09afb9d3bcab]] Former-commit-id: 17cd4afec08291d9dbd8eb15c752b80e0e01b4d1 [formerly f3f6778df21c7e12ad8da474e0b5eb6d83a07b1d] Former-commit-id: 5702fc837ce6e2664225aeab11fca73fb9a711ab --- .../collaboration/comm/SessionManager.java | 244 ------------------ .../comm/provider/CollaborationException.java | 73 ------ 2 files changed, 317 deletions(-) delete mode 100644 cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/SessionManager.java delete mode 100644 cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/CollaborationException.java diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/SessionManager.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/SessionManager.java deleted file mode 100644 index b9ef725905..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/SessionManager.java +++ /dev/null @@ -1,244 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.viz.collaboration.comm; - -import java.util.ArrayList; -import java.util.Collection; - -import org.eclipse.ecf.core.ContainerConnectException; -import org.eclipse.ecf.core.ContainerCreateException; -import org.eclipse.ecf.core.ContainerFactory; -import org.eclipse.ecf.core.IContainer; -import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.core.identity.IDFactory; -import org.eclipse.ecf.core.identity.Namespace; -import org.eclipse.ecf.core.security.ConnectContextFactory; -import org.eclipse.ecf.presence.IPresenceContainerAdapter; -import org.eclipse.ecf.presence.chatroom.IChatRoomInfo; -import org.eclipse.ecf.presence.chatroom.IChatRoomInvitationListener; -import org.eclipse.ecf.presence.chatroom.IChatRoomManager; - -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.info.IVenueInfo; -import com.raytheon.uf.viz.collaboration.comm.identity.listener.IVenueInvitationListener; -import com.raytheon.uf.viz.collaboration.comm.provider.CollaborationException; -import com.raytheon.uf.viz.collaboration.comm.provider.CollaborationSession; -import com.raytheon.uf.viz.collaboration.comm.provider.Errors; -import com.raytheon.uf.viz.collaboration.comm.provider.info.InfoAdapter; - -/** - * - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Feb 24, 2012            jkorman     Initial creation
- *
- *
- * - * @author jkorman - * @version 1.0 - */ - -public class SessionManager { - - public static final String SESSION_P2P = "peertopeer"; - - public static final String SESSION_COLLABORATION = "collaboration"; - - public static final String SESSION_CHAT_ONLY = "chatOnly"; - - public static final String PROVIDER = "ecf.xmpp.smack"; - - private String account; - - private String password; - - private IChatRoomInvitationListener intInvitationListener; - - private IVenueInvitationListener invitationListener; - - private IContainer container = null; - - /** - * @throws ContainerCreateException - * - */ - public SessionManager(String account, String password) throws Exception { - container = ContainerFactory.getDefault().createContainer(PROVIDER); - this.account = account; - this.password = password; - } - - /** - * - * @return - */ - public ISession createPeerToPeerSession() throws CollaborationException { - return (ISession) createSession(SESSION_P2P); - } - - /** - * - * @return - */ - public IVenueSession createChatOnlySession() throws CollaborationException { - return (IVenueSession) createSession(SESSION_CHAT_ONLY); - } - - /** - * - * @return - */ - public IVenueSession createCollaborationSession() throws CollaborationException { - return (IVenueSession) createSession(SESSION_COLLABORATION); - } - - /** - * - * @param sessionKind - * @return - */ - public ISession createSession(String sessionKind) throws CollaborationException { - - ISession session = null; - if(sessionKind != null) { - - if(SESSION_P2P.equals(sessionKind)) { - System.out.println(sessionKind + " Not currently implemented"); - } else if(SESSION_COLLABORATION.equals(sessionKind)) { - session = new CollaborationSession(container); - } else if(SESSION_CHAT_ONLY.equals(sessionKind)) { - System.out.println(sessionKind + " Not currently implemented"); - } else { - System.out.println(sessionKind + " is not a valid session kind."); - } - } - if(session != null) { - int errorCode = session.connect(account, password); - if(errorCode == Errors.BAD_NAME) { - throw new CollaborationException(String.format("Bad name [%s]", account)); - } else if (errorCode == Errors.CANNOT_CONNECT) { - throw new CollaborationException(String.format("Count not connect using name [%s]", account)); - } - } else { - throw new CollaborationException(String.format("Count not connect using name [%s]", account)); - } - return session; - } - - /** - * - * @return - */ - public Collection getVenueInfo() { - // Check to see if the container has been connected. If no, do so - connectToContainer(); - IPresenceContainerAdapter presence = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class); - IChatRoomManager venueManager = presence.getChatRoomManager(); - - Collection info = new ArrayList(); - if(venueManager != null) { - IChatRoomInfo [] roomInfo = venueManager.getChatRoomInfos(); - for(IChatRoomInfo rInfo : roomInfo) { - IVenueInfo vi = InfoAdapter.createVenueInfo(rInfo); - if(vi != null) { - info.add(vi); - } - } - } - - return info; - } - - public IVenueInvitationListener setVenueInvitationListener(IVenueInvitationListener listener) { - connectToContainer(); - IPresenceContainerAdapter presence = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class); - IChatRoomManager venueManager = presence.getChatRoomManager(); - - invitationListener = listener; - if(invitationListener != null) { - // Do we already have one set? - if(intInvitationListener != null) { - venueManager.removeInvitationListener(intInvitationListener); - } - intInvitationListener = new IChatRoomInvitationListener() { - @Override - public void handleInvitationReceived(ID roomID, ID from, - String subject, String body) { - invitationListener.handleInvitation(null, null, subject, body); - } - }; - venueManager.addInvitationListener(intInvitationListener); - } - return listener; - } - - public IVenueInvitationListener removeVenueInvitationListener(IVenueInvitationListener listener) { - connectToContainer(); - IPresenceContainerAdapter presence = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class); - IChatRoomManager venueManager = presence.getChatRoomManager(); - - invitationListener = listener; - if(invitationListener != null) { - venueManager.removeInvitationListener(intInvitationListener); - } - return listener; - } - - - - - private void connectToContainer() { - if(container.getConnectedID() == null) { - Namespace namespace = container.getConnectNamespace(); - - ID targetID = IDFactory.getDefault().createID(namespace, account); - // Now connect - try { - container.connect(targetID, ConnectContextFactory.createPasswordConnectContext(password)); - - System.out.println("Container connected as " + container.getConnectedID()); - - } catch (ContainerConnectException e) { - System.out.println("Error attempting to connect"); - e.printStackTrace(); - } - } - } - - /** - * - */ - public void closeManager() { - if(container != null) { - container.dispose(); - } - } - - - - - -} diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/CollaborationException.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/CollaborationException.java deleted file mode 100644 index 9ca2369746..0000000000 --- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/CollaborationException.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.viz.collaboration.comm.provider; - -/** - * TODO Add Description - * - * 
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Mar 8, 2012            jkorman     Initial creation
- *
- *
- * - * @author jkorman - * @version 1.0 - */ - -public class CollaborationException extends Exception { - - private static final long serialVersionUID = 2897604473798379699L; - - /** - * - */ - public CollaborationException() { - - } - - /** - * @param message - */ - public CollaborationException(String message) { - super(message); - } - - /** - * - * @param message - * @param cause - */ - public CollaborationException(String message, Throwable cause) { - super(message, cause); - } - - /** - * @param cause - */ - public CollaborationException(Throwable cause) { - super(cause); - } - -}