[234041] Prepare graduation

https://bugs.eclipse.org/bugs/show_bug.cgi?id=234041

24 files changed, 32 insertions, 403 deletions

diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
index cc576a7356..6ea5f78426 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/AbstractItemProvider.java
@@ -11,9 +11,9 @@
 package org.eclipse.net4j.buddies.internal.ui;
 
 import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IMembership;
+import org.eclipse.net4j.buddies.common.IBuddy;
+import org.eclipse.net4j.buddies.common.ICollaboration;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
 import org.eclipse.net4j.util.ui.UIUtil;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
index 6f348e27df..4474237376 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesContentProvider.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui;
 
-import org.eclipse.net4j.buddies.protocol.IBuddyContainer;
+import org.eclipse.net4j.buddies.common.IBuddyContainer;
 import org.eclipse.net4j.util.ui.StructuredContentProvider;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
index db03ececce..0daf4a1be1 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/BuddiesItemProvider.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui;
 
-import org.eclipse.net4j.buddies.protocol.IMembership;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.util.ui.views.IElementFilter;
 
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
index 82032f6929..78bece1b2e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/ChatInstaller.java
@@ -11,7 +11,7 @@
 package org.eclipse.net4j.buddies.internal.ui;
 
 import org.eclipse.net4j.buddies.IBuddyCollaboration;
-import org.eclipse.net4j.chat.IChat;
+import org.eclipse.net4j.buddies.chat.IChat;
 
 /**
  * @author Eike Stepper
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
index 7921da1356..c1d617afb7 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsContentProvider.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui;
 
-import org.eclipse.net4j.buddies.protocol.ICollaborationContainer;
+import org.eclipse.net4j.buddies.common.ICollaborationContainer;
 import org.eclipse.net4j.util.ui.StructuredContentProvider;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
index e89954bd10..30cd4b274c 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/CollaborationsItemProvider.java
@@ -10,8 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui;
 
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IMembership;
+import org.eclipse.net4j.buddies.common.ICollaboration;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.internal.buddies.Self;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
index 8430f78cc0..758fd4d812 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/MembershipItemProvider.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui;
 
-import org.eclipse.net4j.buddies.protocol.IMembership;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.util.ui.views.IElementFilter;
 
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java
deleted file mode 100644
index 9dc74ed073..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/SessionManager.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.buddies.internal.ui;
-
-import org.eclipse.net4j.Net4jUtil;
-import org.eclipse.net4j.buddies.BuddiesUtil;
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.buddies.ui.ISessionManagerEvent;
-import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.buddies.Self;
-import org.eclipse.net4j.internal.util.event.Event;
-import org.eclipse.net4j.internal.util.lifecycle.Lifecycle;
-import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;
-import org.eclipse.net4j.util.container.IContainerDelta;
-import org.eclipse.net4j.util.container.IContainerEvent;
-import org.eclipse.net4j.util.container.IPluginContainer;
-import org.eclipse.net4j.util.event.IEvent;
-import org.eclipse.net4j.util.event.IListener;
-import org.eclipse.net4j.util.lifecycle.ILifecycleEvent;
-import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
-
-import java.text.MessageFormat;
-
-public class SessionManager extends Lifecycle implements ISessionManager, IListener
-{
-  public static final SessionManager INSTANCE = new SessionManager();
-
-  private IBuddySession session;
-
-  private State state = State.DISCONNECTED;
-
-  private boolean connecting;
-
-  private boolean flashing;
-
-  private SessionManager()
-  {
-  }
-
-  public IBuddySession getSession()
-  {
-    return session;
-  }
-
-  public State getState()
-  {
-    return state;
-  }
-
-  public void setState(State state)
-  {
-    if (this.state != state)
-    {
-      IEvent event = new SessionManagerEvent(this.state, state, session);
-      this.state = state;
-      fireEvent(event);
-    }
-  }
-
-  public boolean isFlashing()
-  {
-    return flashing;
-  }
-
-  public boolean isConnecting()
-  {
-    return state == ISessionManager.State.CONNECTING;
-  }
-
-  public String getConnectorDescription()
-  {
-    return OM.PREF_CONNECTOR_DESCRIPTION.getValue();
-  }
-
-  public String getUserID()
-  {
-    return OM.PREF_USER_ID.getValue();
-  }
-
-  public String getPassword()
-  {
-    return OM.PREF_PASSWORD.getValue();
-  }
-
-  public Boolean isAutoConnect()
-  {
-    return OM.PREF_AUTO_CONNECT.getValue();
-  }
-
-  public void connect()
-  {
-    new Thread("buddies-connector")
-    {
-      @Override
-      public void run()
-      {
-        try
-        {
-          setState(ISessionManager.State.CONNECTING);
-          connecting = true;
-          while (session == null && connecting)
-          {
-            IConnector connector = Net4jUtil.getConnector(IPluginContainer.INSTANCE, getConnectorDescription());
-            if (connector == null)
-            {
-              throw new IllegalStateException("connector == null");
-            }
-
-            boolean connected = connector.waitForConnection(5000L);
-            if (connected)
-            {
-              session = BuddiesUtil.openSession(connector, getUserID(), getPassword(), 5000L);
-              if (session != null)
-              {
-                if (connecting)
-                {
-                  session.addListener(SessionManager.this);
-                  setState(ISessionManager.State.CONNECTED);
-                }
-                else
-                {
-                  session.close();
-                  session = null;
-                  setState(ISessionManager.State.DISCONNECTED);
-                }
-              }
-            }
-            else
-            {
-              LifecycleUtil.deactivate(connector);
-            }
-          }
-        }
-        finally
-        {
-          connecting = false;
-        }
-      }
-    }.start();
-  }
-
-  public void disconnect()
-  {
-    connecting = false;
-    if (session != null)
-    {
-      session.removeListener(this);
-      session.close();
-      session = null;
-    }
-
-    setState(ISessionManager.State.DISCONNECTED);
-  }
-
-  public void flashMe()
-  {
-    if (session != null && !flashing)
-    {
-      final Self self = (Self)session.getSelf();
-      final IBuddy.State original = self.getState();
-      new Thread("buddies-flasher")
-      {
-        @Override
-        public void run()
-        {
-          flashing = true;
-          IBuddy.State state = original == IBuddy.State.AVAILABLE ? IBuddy.State.LONESOME : IBuddy.State.AVAILABLE;
-          for (int i = 0; i < 15; i++)
-          {
-            self.setState(state);
-            ConcurrencyUtil.sleep(200);
-            state = state == IBuddy.State.AVAILABLE ? IBuddy.State.LONESOME : IBuddy.State.AVAILABLE;
-          }
-
-          self.setState(original);
-          flashing = false;
-        }
-      }.start();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public void notifyEvent(IEvent event)
-  {
-    if (event.getSource() == session)
-    {
-      if (event instanceof ILifecycleEvent)
-      {
-        if (((ILifecycleEvent)event).getKind() == ILifecycleEvent.Kind.DEACTIVATED)
-        {
-          disconnect();
-          if (isAutoConnect())
-          {
-            connect();
-          }
-        }
-      }
-      else if (event instanceof IContainerEvent)
-      {
-        IContainerEvent<IBuddy> e = (IContainerEvent<IBuddy>)event;
-        if (e.getDeltaKind() == IContainerDelta.Kind.ADDED)
-        {
-          e.getDeltaElement().addListener(this);
-        }
-        else if (e.getDeltaKind() == IContainerDelta.Kind.REMOVED)
-        {
-          e.getDeltaElement().removeListener(this);
-        }
-      }
-    }
-  }
-
-  @Override
-  protected void doActivate() throws Exception
-  {
-    super.doActivate();
-    if (isAutoConnect())
-    {
-      connect();
-    }
-  }
-
-  @Override
-  protected void doDeactivate() throws Exception
-  {
-    disconnect();
-    super.doDeactivate();
-  }
-
-  /**
-   * @author Eike Stepper
-   */
-  private final class SessionManagerEvent extends Event implements ISessionManagerEvent
-  {
-    private static final long serialVersionUID = 1L;
-
-    private State oldState;
-
-    private State newState;
-
-    private IBuddySession session;
-
-    public SessionManagerEvent(State oldState, State newState, IBuddySession session)
-    {
-      super(SessionManager.this);
-      this.oldState = oldState;
-      this.newState = newState;
-      this.session = session;
-    }
-
-    public State getOldState()
-    {
-      return oldState;
-    }
-
-    public State getNewState()
-    {
-      return newState;
-    }
-
-    public IBuddySession getSession()
-    {
-      return session;
-    }
-
-    @Override
-    public String toString()
-    {
-      return MessageFormat.format("SessionManagerEvent[source={0}, oldState={1}, newState={2}, session={3}]",
-          getSource(), getOldState(), getNewState(), getSession());
-    }
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
index cc34609dcc..f8c98e87cf 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ConnectAction.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.actions;
 
-import org.eclipse.net4j.buddies.ui.ISessionManager;
+import org.eclipse.net4j.buddies.ISessionManager;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
index 359e7f6379..702aea9a31 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/DisconnectAction.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.actions;
 
-import org.eclipse.net4j.buddies.ui.ISessionManager;
+import org.eclipse.net4j.buddies.ISessionManager;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
index 3b35d0a632..2fcb462460 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/FlashAction.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.actions;
 
-import org.eclipse.net4j.buddies.ui.ISessionManager;
+import org.eclipse.net4j.buddies.ISessionManager;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
index 7b5bb62280..11104681f4 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/ReconnectAction.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.actions;
 
-import org.eclipse.net4j.buddies.ui.ISessionManager;
+import org.eclipse.net4j.buddies.ISessionManager;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
 /**
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
index 8e38d9d105..3d38637bd3 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/actions/StateAction.java
@@ -11,9 +11,9 @@
 package org.eclipse.net4j.buddies.internal.ui.actions;
 
 import org.eclipse.net4j.buddies.IBuddySession;
+import org.eclipse.net4j.buddies.ISessionManager;
+import org.eclipse.net4j.buddies.common.IBuddy.State;
 import org.eclipse.net4j.buddies.internal.ui.SharedIcons;
-import org.eclipse.net4j.buddies.protocol.IBuddy.State;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
 import org.eclipse.net4j.internal.buddies.Self;
 import org.eclipse.net4j.util.ui.actions.SafeAction;
 
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
index 677ea95108..ed7dc8ba80 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/bundle/OM.java
@@ -10,12 +10,10 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.bundle;
 
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
+import org.eclipse.net4j.internal.buddies.SessionManager;
 import org.eclipse.net4j.util.om.OMBundle;
 import org.eclipse.net4j.util.om.OMPlatform;
 import org.eclipse.net4j.util.om.log.OMLogger;
-import org.eclipse.net4j.util.om.pref.OMPreference;
-import org.eclipse.net4j.util.om.pref.OMPreferences;
 import org.eclipse.net4j.util.om.trace.OMTracer;
 import org.eclipse.net4j.util.ui.UIActivator;
 
@@ -36,20 +34,6 @@ public abstract class OM
 
   public static final OMLogger LOG = BUNDLE.logger();
 
-  public static final OMPreferences PREFS = BUNDLE.preferences();
-
-  public static final OMPreference<String> PREF_CONNECTOR_DESCRIPTION = // 
-  PREFS.init("PREF_CONNECTOR_DESCRIPTION", "tcp://localhost"); //$NON-NLS-1$
-
-  public static final OMPreference<String> PREF_USER_ID = // 
-  PREFS.init("PREF_USER_ID", System.getProperty("user.name")); //$NON-NLS-1$
-
-  public static final OMPreference<String> PREF_PASSWORD = // 
-  PREFS.initString("PREF_PASSWORD"); //$NON-NLS-1$
-
-  public static final OMPreference<Boolean> PREF_AUTO_CONNECT = // 
-  PREFS.init("PREF_AUTO_CONNECT", false); //$NON-NLS-1$
-
   static void start() throws Exception
   {
     SessionManager.INSTANCE.activate();
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
index 01f5b808a7..e911e417a7 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/dnd/BuddiesTransfer.java
@@ -11,9 +11,9 @@
 package org.eclipse.net4j.buddies.internal.ui.dnd;
 
 import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
+import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
+import org.eclipse.net4j.internal.buddies.SessionManager;
 import org.eclipse.net4j.util.io.ExtendedDataInputStream;
 import org.eclipse.net4j.util.io.ExtendedDataOutputStream;
 import org.eclipse.net4j.util.ui.dnd.DNDTransfer;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
index 76f9650b96..0e354b178f 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/preferences/BuddiesPreferencePage.java
@@ -10,7 +10,7 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.preferences;
 
-import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
+import org.eclipse.net4j.internal.buddies.bundle.OM;
 import org.eclipse.net4j.util.ui.UIUtil;
 import org.eclipse.net4j.util.ui.prefs.OMPreferencePage;
 
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java
index 75d1b503cf..85d760da58 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDragListener.java
@@ -10,8 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.views;
 
+import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.internal.ui.dnd.BuddiesTransfer;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
 import org.eclipse.net4j.util.ui.dnd.DNDDragListener;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java
index bd17f171b6..ab9732657e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesDropAdapter.java
@@ -11,8 +11,8 @@
 package org.eclipse.net4j.buddies.internal.ui.views;
 
 import org.eclipse.net4j.buddies.IBuddyCollaboration;
+import org.eclipse.net4j.buddies.common.IBuddy;
 import org.eclipse.net4j.buddies.internal.ui.dnd.BuddiesTransfer;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
 import org.eclipse.net4j.util.ui.dnd.DNDDropAdapter;
 
 import org.eclipse.jface.viewers.StructuredViewer;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
index 37616666ca..7ca5e0c7ab 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/BuddiesView.java
@@ -11,9 +11,9 @@
 package org.eclipse.net4j.buddies.internal.ui.views;
 
 import org.eclipse.net4j.buddies.IBuddyCollaboration;
+import org.eclipse.net4j.buddies.common.IBuddy;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.buddies.internal.ui.ChatInstaller;
-import org.eclipse.net4j.buddies.protocol.IBuddy;
-import org.eclipse.net4j.buddies.protocol.IMembership;
 import org.eclipse.net4j.util.container.ContainerUtil;
 import org.eclipse.net4j.util.container.IContainer;
 
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java
index 3fe996495c..e3c5b4d17e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/CollaborationsPane.java
@@ -12,10 +12,10 @@ package org.eclipse.net4j.buddies.internal.ui.views;
 
 import org.eclipse.net4j.buddies.IBuddyCollaboration;
 import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.protocol.ICollaboration;
-import org.eclipse.net4j.buddies.protocol.IFacility;
-import org.eclipse.net4j.buddies.protocol.IFacilityInstalledEvent;
-import org.eclipse.net4j.buddies.protocol.IMembership;
+import org.eclipse.net4j.buddies.common.ICollaboration;
+import org.eclipse.net4j.buddies.common.IFacility;
+import org.eclipse.net4j.buddies.common.IFacilityInstalledEvent;
+import org.eclipse.net4j.buddies.common.IMembership;
 import org.eclipse.net4j.buddies.ui.IFacilityPaneCreator;
 import org.eclipse.net4j.util.ObjectUtil;
 import org.eclipse.net4j.util.StringUtil;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
index 0c315fb09e..a34bf4716e 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/FacilityPane.java
@@ -10,8 +10,8 @@
  **************************************************************************/
 package org.eclipse.net4j.buddies.internal.ui.views;
 
+import org.eclipse.net4j.buddies.common.IFacility;
 import org.eclipse.net4j.buddies.internal.ui.bundle.OM;
-import org.eclipse.net4j.buddies.protocol.IFacility;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
 import org.eclipse.net4j.util.ui.UIUtil;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
index 9c7a1762b0..10d68eea86 100644
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
+++ b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/internal/ui/views/SessionManagerView.java
@@ -11,15 +11,15 @@
 package org.eclipse.net4j.buddies.internal.ui.views;
 
 import org.eclipse.net4j.buddies.IBuddySession;
+import org.eclipse.net4j.buddies.ISessionManager;
+import org.eclipse.net4j.buddies.ISessionManagerEvent;
+import org.eclipse.net4j.buddies.common.IBuddyStateEvent;
 import org.eclipse.net4j.buddies.internal.ui.BuddiesItemProvider;
 import org.eclipse.net4j.buddies.internal.ui.actions.ConnectAction;
 import org.eclipse.net4j.buddies.internal.ui.actions.DisconnectAction;
 import org.eclipse.net4j.buddies.internal.ui.actions.FlashAction;
 import org.eclipse.net4j.buddies.internal.ui.actions.ReconnectAction;
 import org.eclipse.net4j.buddies.internal.ui.actions.StateAction.DropDownAction;
-import org.eclipse.net4j.buddies.protocol.IBuddyStateEvent;
-import org.eclipse.net4j.buddies.ui.ISessionManager;
-import org.eclipse.net4j.buddies.ui.ISessionManagerEvent;
 import org.eclipse.net4j.util.container.IContainer;
 import org.eclipse.net4j.util.event.IEvent;
 import org.eclipse.net4j.util.event.IListener;
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java
deleted file mode 100644
index a168df5d14..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManager.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.buddies.ui;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.buddies.internal.ui.SessionManager;
-import org.eclipse.net4j.util.event.INotifier;
-
-/**
- * @author Eike Stepper
- */
-public interface ISessionManager extends INotifier
-{
-  public static final ISessionManager INSTANCE = SessionManager.INSTANCE;
-
-  public IBuddySession getSession();
-
-  public State getState();
-
-  public boolean isConnecting();
-
-  public void connect();
-
-  public void disconnect();
-
-  public void flashMe();
-
-  public boolean isFlashing();
-
-  /**
-   * @author Eike Stepper
-   */
-  public enum State
-  {
-    CONNECTING, CONNECTED, DISCONNECTED
-  }
-}
diff --git a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java b/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java
deleted file mode 100644
index a681be1e7a..0000000000
--- a/plugins/org.eclipse.net4j.buddies.ui/src/org/eclipse/net4j/buddies/ui/ISessionManagerEvent.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- * Copyright (c) 2004 - 2008 Eike Stepper, Germany.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Eike Stepper - initial API and implementation
- **************************************************************************/
-package org.eclipse.net4j.buddies.ui;
-
-import org.eclipse.net4j.buddies.IBuddySession;
-import org.eclipse.net4j.util.event.IEvent;
-
-/**
- * @author Eike Stepper
- */
-public interface ISessionManagerEvent extends IEvent
-{
-  public ISessionManager.State getOldState();
-
-  public ISessionManager.State getNewState();
-
-  public IBuddySession getSession();
-}