Added serialVersionID in serializable classes. Added interfaces to org.eclipse.ecf.core.security. Added new joinGroup method to ISharedObjectContainer interface and all implementers

49 files changed, 253 insertions, 68 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
index 78f0e0b4b..7a3f5120d 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ClientSOContainer.java
@@ -13,6 +13,10 @@ import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.Serializable;
 import java.net.ConnectException;
+
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+
 import org.eclipse.ecf.core.ISharedObjectContainerConfig;
 import org.eclipse.ecf.core.SharedObjectContainerJoinException;
 import org.eclipse.ecf.core.SharedObjectDescription;
@@ -29,6 +33,7 @@ import org.eclipse.ecf.core.events.SharedObjectContainerJoinGroupEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerJoinedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerLeaveGroupEvent;
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.security.IJoinAuthorizationContext;
 import org.eclipse.ecf.provider.generic.gmm.Member;
 
 public abstract class ClientSOContainer extends SOContainer {
@@ -88,7 +93,108 @@ public abstract class ClientSOContainer extends SOContainer {
             return remoteServerID;
         }
 	}
+	protected Callback[] makeJoinCallbacks(Object connectData) {
+		return null;
+	}
+	public void joinGroup(ID remote, IJoinAuthorizationContext joinContext) throws SharedObjectContainerJoinException {
+		// first notify synchonously
+		fireContainerEvent(new SharedObjectContainerJoinGroupEvent(
+				this.getID(), remote, joinContext));
+		try {
+			if (isClosing)
+				throw new IllegalStateException("container is closing");
+			debug("joingroup:" + remote + ":" + joinContext);
+			ISynchAsynchConnection aConnection = getClientConnection(remote,
+					joinContext);
+			if (aConnection == null) {
+				ConnectException c = new ConnectException("join failed to"
+						+ ":" + remote.getName());
+				throw c;
+			}
+			Object response;
+			synchronized (connectLock) {
+				if (isConnected()) {
+					killConnection(aConnection);
+					aConnection = null;
+					ConnectException c = new ConnectException(
+							"already connected to " + getGroupID());
+					throw c;
+				}
+				if (isConnecting()) {
+					killConnection(aConnection);
+					aConnection = null;
+					ConnectException c = new ConnectException(
+							"currently connecting");
+					throw c;
+				}
+				connectionState = CONNECTING;
+				connection = aConnection;
+			}
+			synchronized (aConnection) {
+				try {
+					Object connectData = getConnectData(remote, joinContext);
+					// Get handler from joinContext and get appropriate data
+					if (joinContext != null) {
+						CallbackHandler handler = joinContext.getCallbackHandler();
+						if (handler != null) {
+							handler.handle(makeJoinCallbacks(connectData));
+						}
+					}
+					// Make connect call
+					response = aConnection.connect(remote, connectData,
+							getConnectTimeout());
+					
+				} catch (IOException e) {
+					synchronized (connectLock) {
+						killConnection(aConnection);
+						if (connection != aConnection) {
+							aConnection = null;
+							throw e;
+						}
+						connectionState = UNCONNECTED;
+						connection = null;
+						remoteServerID = null;
+					}
+					throw e;
+				}
+				synchronized (connectLock) {
+					// If not in correct state, disconnect and return
+					if (connection != aConnection) {
+						killConnection(aConnection);
+						aConnection = null;
+						ConnectException c = new ConnectException(
+								"join failed because not in correct state");
+						throw c;
+					}
+					ID serverID = null;
+					try {
+						serverID = acceptNewServer(remote, response);
+					} catch (Exception e) {
+						killConnection(aConnection);
+						aConnection = null;
+						connection = null;
+						remoteServerID = null;
+						connectionState = UNCONNECTED;
+						ConnectException c = new ConnectException(
+								"join refused locally via acceptNewServer");
+						throw c;
+					}
+					aConnection.start();
+					remoteServerID = serverID;
+					connectionState = CONNECTED;
+				}
+			}
+		} catch (Exception e) {
+			dumpStack("Exception in joinGroup", e);
+			SharedObjectContainerJoinException except = new SharedObjectContainerJoinException(
+					"joinGroup exception in container " + getID() + " joining "
+							+ remote + ": " + e.getClass().getName() + ": "
+							+ e.getMessage());
 
+			except.setStackTrace(e.getStackTrace());
+			throw except;
+		}
+	}
 	public void joinGroup(ID remote, Object data)
 			throws SharedObjectContainerJoinException {
 		// first notify synchonously
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
index c43824b38..b9dd75e1c 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/ServerSOContainer.java
@@ -26,6 +26,7 @@ import org.eclipse.ecf.core.events.SharedObjectContainerDepartedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerEjectedEvent;
 import org.eclipse.ecf.core.events.SharedObjectContainerJoinedEvent;
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.security.IJoinAuthorizationContext;
 import org.eclipse.ecf.provider.generic.gmm.Member;
 
 public class ServerSOContainer extends SOContainer implements ISharedObjectContainerGroupManager {
@@ -259,4 +260,10 @@ public class ServerSOContainer extends SOContainer implements ISharedObjectConta
         ejectAllGroupMembers(null);
         super.dispose(timeout);
     }
+
+	public void joinGroup(ID groupID, IJoinAuthorizationContext joinContext) throws SharedObjectContainerJoinException {
+        SharedObjectContainerJoinException e = new SharedObjectContainerJoinException(
+                "ServerApplication cannot join group " + groupID.getName());
+        throw e;
+	}
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
index 4901b99e9..dd921408a 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/TCPClientSOContainer.java
@@ -12,11 +12,13 @@
 package org.eclipse.ecf.provider.generic;
 
 import org.eclipse.ecf.core.ISharedObjectContainerConfig;
+import org.eclipse.ecf.core.SharedObjectContainerJoinException;
 import org.eclipse.ecf.core.comm.ConnectionFactory;
 import org.eclipse.ecf.core.comm.ConnectionInstantiationException;
 import org.eclipse.ecf.core.comm.ISynchAsynchConnection;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
+import org.eclipse.ecf.core.security.IJoinAuthorizationContext;
 
 public class TCPClientSOContainer extends ClientSOContainer {
     int keepAlive = 0;
@@ -52,4 +54,5 @@ public class TCPClientSOContainer extends ClientSOContainer {
         container.joinGroup(serverID, null);
         Thread.sleep(200000);
     }
+
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
index ff35120f8..37c331be5 100644
--- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF
@@ -10,11 +10,12 @@ Eclipse-AutoStart: true
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.core.runtime
 Provide-Package: org.eclipse.ecf.core,
+ org.eclipse.ecf.core.comm,
+ org.eclipse.ecf.core.comm.provider,
  org.eclipse.ecf.core.events,
  org.eclipse.ecf.core.identity,
  org.eclipse.ecf.core.identity.provider,
  org.eclipse.ecf.core.provider,
- org.eclipse.ecf.core.comm,
- org.eclipse.ecf.core.comm.provider,
- org.eclipse.ecf.core.util,
- org.eclipse.ecf.core.user
+ org.eclipse.ecf.core.security,
+ org.eclipse.ecf.core.user,
+ org.eclipse.ecf.core.util
diff --git a/framework/bundles/org.eclipse.ecf/plugin.xml b/framework/bundles/org.eclipse.ecf/plugin.xml
index 2352100cd..68c62c982 100644
--- a/framework/bundles/org.eclipse.ecf/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf/plugin.xml
@@ -1,25 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.ecf"
-   name="ECF - Eclipse Communications Framework"
-   version="0.1.0"
-   provider-name="Eclipse.org"
-   class="org.eclipse.ecf.internal.core.ECFPlugin">
-
-   <runtime>
-      <library name="ecf.jar">
-         <export name="*"/>
-      </library>
-   </runtime>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
+<plugin>
    <extension-point id="containerFactory" name="ECF Container Factory" schema="schema/containerFactory.exsd"/>
    <extension-point id="namespace" name="ECF Namespace" schema="schema/namespace.exsd"/>
    <extension-point id="connectionFactory" name="connectionFactory" schema="schema/connectionFactory.exsd"/>
-   
 </plugin>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
index 76ac7ccb7..229e09be9 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContainer.java
@@ -10,6 +10,7 @@
 package org.eclipse.ecf.core;
 
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.core.security.IJoinAuthorizationContext;
 
 /**
  * Core interface that must be implemented by all ECF container instances.
@@ -84,13 +85,13 @@ public interface ISharedObjectContainer {
      * @param groupID
      *            the ID of the remote service to join
      * @param joinContext
-     *            any required login/authentication context to allow this container
-     *            to authenticate
+     *            any required authentication context to allow this container
+     *            to authenticate on join with remote containers
      * @exception SharedObjectContainerJoinException
      *                thrown if communication cannot be established with remote
      *                service
      */
-	//public void joinGroup(ID groupID, IJoinContext joinContext) throws SharedObjectContainerJoinException;
+	public void joinGroup(ID groupID, IJoinAuthorizationContext joinContext) throws SharedObjectContainerJoinException;
 	
     /**
      * Leave a container group. This operation will disconnect the local
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java
index deb7a1f16..aecb9b213 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddAbortException.java
@@ -11,7 +11,9 @@ package org.eclipse.ecf.core;
 
 public class SharedObjectAddAbortException extends SharedObjectAddException {
 
-    protected long timeout = -1L;
+	private static final long serialVersionUID = 4120851079287223088L;
+
+	protected long timeout = -1L;
 
     public SharedObjectAddAbortException() {
         super();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java
index 0b190c4d2..c9455fb28 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectAddException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectAddException extends ECFException {
 
-    public SharedObjectAddException() {
+	private static final long serialVersionUID = 3257853198755705913L;
+
+	public SharedObjectAddException() {
         super();
     }
     public SharedObjectAddException(String arg0) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java
index e4b95b368..e321faf2c 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectConnectException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectConnectException extends ECFException {
 
-    public SharedObjectConnectException() {
+	private static final long serialVersionUID = 3256440287659570228L;
+
+	public SharedObjectConnectException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java
index 45ea8fd9b..bbe78acf8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInitException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectContainerInitException extends ECFException {
 
-    public SharedObjectContainerInitException() {
+	private static final long serialVersionUID = 3690189958417888565L;
+
+	public SharedObjectContainerInitException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java
index eb881f372..f1fc5e7ea 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerInstantiationException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectContainerInstantiationException extends ECFException {
 
-    public SharedObjectContainerInstantiationException() {
+	private static final long serialVersionUID = 3257283617356265781L;
+
+	public SharedObjectContainerInstantiationException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerJoinException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerJoinException.java
index e05b62289..998869e1f 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerJoinException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectContainerJoinException.java
@@ -11,7 +11,9 @@ package org.eclipse.ecf.core;
 
 public class SharedObjectContainerJoinException extends Exception {
 
-    public SharedObjectContainerJoinException() {
+	private static final long serialVersionUID = 3834874676269561909L;
+
+	public SharedObjectContainerJoinException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java
index a85e7b8ba..7446b4f6e 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectCreateException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectCreateException extends ECFException {
 
-    public SharedObjectCreateException() {
+	private static final long serialVersionUID = 3546919195137815606L;
+
+	public SharedObjectCreateException() {
         super();
     }
     public SharedObjectCreateException(String arg0) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
index 16a61de54..51015a212 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDescription.java
@@ -22,7 +22,9 @@ import org.eclipse.ecf.core.identity.ID;
  */
 public class SharedObjectDescription implements Serializable {
 
-    protected static long staticID = 0;
+	private static final long serialVersionUID = 3257848783613146929L;
+
+	protected static long staticID = 0;
 
     protected transient ClassLoader classLoader;
     protected ID id;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java
index f7b9e0536..1cc54a0f4 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectDisconnectException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectDisconnectException extends ECFException {
 
-    public SharedObjectDisconnectException() {
+	private static final long serialVersionUID = 3258689922876586289L;
+
+	public SharedObjectDisconnectException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java
index 3990cbc17..f379ddc6a 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectInitException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectInitException extends ECFException {
 
-    public SharedObjectInitException() {
+	private static final long serialVersionUID = 3617579318620862771L;
+
+	public SharedObjectInitException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java
index a7c4178aa..4988bb383 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/SharedObjectNotFoundException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class SharedObjectNotFoundException extends ECFException {
 
-    public SharedObjectNotFoundException() {
+	private static final long serialVersionUID = 3256725086957285689L;
+
+	public SharedObjectNotFoundException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/AsynchConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/AsynchConnectionEvent.java
index 5697adf86..401e469cf 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/AsynchConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/AsynchConnectionEvent.java
@@ -12,7 +12,9 @@
 package org.eclipse.ecf.core.comm;
 
 public class AsynchConnectionEvent extends ConnectionEvent {
-    public AsynchConnectionEvent(IAsynchConnection conn, Object data) {
+	private static final long serialVersionUID = 3618136762325873465L;
+
+	public AsynchConnectionEvent(IAsynchConnection conn, Object data) {
         super(conn, data);
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionEvent.java
index f705d215c..914393192 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionEvent.java
@@ -15,7 +15,8 @@ import org.eclipse.ecf.core.util.Event;
 
 public class ConnectionEvent implements Event {
 
-    Object data = null;
+	private static final long serialVersionUID = 3257290214476362291L;
+	Object data = null;
     IConnection connection = null;
 
     public ConnectionEvent(IConnection source, Object data) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionInstantiationException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionInstantiationException.java
index a33e54ea1..158a28dc0 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionInstantiationException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/ConnectionInstantiationException.java
@@ -13,7 +13,9 @@ package org.eclipse.ecf.core.comm;
 
 public class ConnectionInstantiationException extends Exception {
 
-    public ConnectionInstantiationException() {
+	private static final long serialVersionUID = 3904958651231058229L;
+
+	public ConnectionInstantiationException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/DisconnectConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/DisconnectConnectionEvent.java
index 533a1f9d2..561a29e7a 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/DisconnectConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/DisconnectConnectionEvent.java
@@ -13,7 +13,8 @@ package org.eclipse.ecf.core.comm;
 
 public class DisconnectConnectionEvent extends ConnectionEvent {
 
-    Throwable exception = null;
+	private static final long serialVersionUID = 3545519491132832050L;
+	Throwable exception = null;
 
     public DisconnectConnectionEvent(IAsynchConnection conn, Throwable e,
             Object data) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SuspectConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SuspectConnectionEvent.java
index 90ebcc1a1..db1fed3ab 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SuspectConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SuspectConnectionEvent.java
@@ -13,7 +13,9 @@ package org.eclipse.ecf.core.comm;
 
 class SuspectConnectionEvent extends ConnectionEvent {
 
-    public SuspectConnectionEvent(IConnection source, Object data) {
+	private static final long serialVersionUID = 3688783665748588344L;
+
+	public SuspectConnectionEvent(IConnection source, Object data) {
         super(source, data);
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SynchConnectionEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SynchConnectionEvent.java
index 40be095e2..5ef51c9f8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SynchConnectionEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/comm/SynchConnectionEvent.java
@@ -12,7 +12,9 @@
 package org.eclipse.ecf.core.comm;
 
 public class SynchConnectionEvent extends ConnectionEvent {
-    public SynchConnectionEvent(ISynchConnection conn, Object data) {
+	private static final long serialVersionUID = 3257288019714324532L;
+
+	public SynchConnectionEvent(ISynchConnection conn, Object data) {
         super(conn, data);
     }
 }
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java
index b8bb1d17e..afc4b3082 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectCreateResponseEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class RemoteSharedObjectCreateResponseEvent extends
         RemoteSharedObjectEvent implements ISharedObjectCreateResponseEvent {
-    long sequence = 0;
+	private static final long serialVersionUID = 3618421544527738673L;
+	long sequence = 0;
 
     public RemoteSharedObjectCreateResponseEvent(ID senderObj, ID remoteCont,
             long seq, Throwable exception) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
index d2130ba36..39d89d959 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/RemoteSharedObjectEvent.java
@@ -14,7 +14,8 @@ import org.eclipse.ecf.core.util.Event;
 
 public class RemoteSharedObjectEvent implements ISharedObjectMessageEvent,
         Serializable {
-    private final ID senderSharedObjectID;
+	private static final long serialVersionUID = 3257572797621680182L;
+	private final ID senderSharedObjectID;
     private final ID remoteContainerID;
     private final Object data;
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
index 5487c4a4c..156b4c851 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectActivatedEvent.java
@@ -12,7 +12,8 @@ import java.util.Arrays;
 import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectActivatedEvent implements ISharedObjectActivatedEvent {
-    private final ID activatedID;
+	private static final long serialVersionUID = 3258416110105079864L;
+	private final ID activatedID;
     private final ID[] groupMemberIDs;
     private final ID localContainerID;
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
index 495b815a3..8e925bfd7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDepartedEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerDepartedEvent implements
         ISharedObjectContainerDepartedEvent {
-    private final ID departedContainerID;
+	private static final long serialVersionUID = 3256437002059527733L;
+	private final ID departedContainerID;
     private final ID localContainerID;
 
     public SharedObjectContainerDepartedEvent(ID container, ID o) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDisposeEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDisposeEvent.java
index 419b66d1c..d406b09ec 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDisposeEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerDisposeEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerDisposeEvent implements
         ISharedObjectContainerDisposeEvent {
-    private final ID localContainerID;
+	private static final long serialVersionUID = 3618138961349062706L;
+	private final ID localContainerID;
 
     public SharedObjectContainerDisposeEvent(ID container) {
         super();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java
index 9dceae471..73a521167 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerEjectedEvent.java
@@ -13,7 +13,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerEjectedEvent implements
         ISharedObjectContainerEjectedEvent {
-    private final ID localContainerID;
+	private static final long serialVersionUID = 3257567299946033970L;
+	private final ID localContainerID;
     private final ID groupID;
     private final Serializable reason;
     
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinGroupEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinGroupEvent.java
index 1537933b4..a70bec655 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinGroupEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinGroupEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerJoinGroupEvent implements
         ISharedObjectContainerJoinGroupEvent {
-    ID localContainerID;
+	private static final long serialVersionUID = 3544952173248263729L;
+	ID localContainerID;
     ID groupID;
     Object data;
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
index d008f0fae..8f1dde0a7 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerJoinedEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerJoinedEvent implements
         ISharedObjectContainerJoinedEvent {
-    private final ID joinedContainerID;
+	private static final long serialVersionUID = 3833467322827617078L;
+	private final ID joinedContainerID;
     private final ID localContainerID;
 
     public SharedObjectContainerJoinedEvent(ID local, ID joinContainerID) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveGroupEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveGroupEvent.java
index 0457abde3..6b7674b54 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveGroupEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectContainerLeaveGroupEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectContainerLeaveGroupEvent implements
         ISharedObjectContainerLeaveGroupEvent {
-    ID localContainerID;
+	private static final long serialVersionUID = 3257570607204742200L;
+	ID localContainerID;
     ID groupID;
 
     public SharedObjectContainerLeaveGroupEvent(ID localContainerID, ID groupID) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
index 73436b61b..a739a3b47 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectDeactivatedEvent.java
@@ -12,7 +12,8 @@ import org.eclipse.ecf.core.identity.ID;
 
 public class SharedObjectDeactivatedEvent implements
         ISharedObjectDeactivatedEvent {
-    private final ID deactivatedID;
+	private static final long serialVersionUID = 3257291344119476786L;
+	private final ID deactivatedID;
     private final ID localContainerID;
 
     public SharedObjectDeactivatedEvent(ID container, ID deact) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java
index da0033dcf..41d41db08 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerAddEvent.java
@@ -19,7 +19,8 @@ import org.eclipse.ecf.core.identity.ID;
 public class SharedObjectManagerAddEvent implements
         ISharedObjectManagerEvent {
     
-    ID localContainerID = null;
+	private static final long serialVersionUID = 3258413923916330551L;
+	ID localContainerID = null;
     Map properties = null;
     ISharedObject sharedObject = null;
     ID sharedObjectID = null;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java
index 9ec62ff70..f231f5b77 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerConnectEvent.java
@@ -17,7 +17,8 @@ import org.eclipse.ecf.core.identity.ID;
  */
 public class SharedObjectManagerConnectEvent implements
         ISharedObjectManagerEvent {
-    ID localContainerID = null;
+	private static final long serialVersionUID = 3544670676712633650L;
+	ID localContainerID = null;
     ID [] sharedObjectReceiverIDs = null;
     
     ID sharedObjectSenderID = null;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java
index a9cb451de..3edd86d72 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerCreateEvent.java
@@ -18,7 +18,8 @@ import org.eclipse.ecf.core.identity.ID;
 public class SharedObjectManagerCreateEvent implements
         ISharedObjectManagerEvent {
     
-    SharedObjectDescription description = null;
+	private static final long serialVersionUID = 3905527103070878006L;
+	SharedObjectDescription description = null;
     ID localContainerID = null;
     
     public SharedObjectManagerCreateEvent(ID localContainerID, SharedObjectDescription description) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java
index 2d4ede045..1ead5cee5 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerDisconnectEvent.java
@@ -16,7 +16,8 @@ import org.eclipse.ecf.core.identity.ID;
  */
 public class SharedObjectManagerDisconnectEvent implements
         ISharedObjectManagerEvent {
-    ID localContainerID = null;
+	private static final long serialVersionUID = 3257008743777448761L;
+	ID localContainerID = null;
     ID sharedObjectSenderID = null;
     
     public SharedObjectManagerDisconnectEvent(ID localContainerID, ID sharedObjectSenderID) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java
index e78f8683c..260eeb63f 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/events/SharedObjectManagerRemoveEvent.java
@@ -17,7 +17,8 @@ import org.eclipse.ecf.core.identity.ID;
 public class SharedObjectManagerRemoveEvent implements
         ISharedObjectManagerEvent {
     
-    ID sharedObjectID = null;
+	private static final long serialVersionUID = 3256728389754106931L;
+	ID sharedObjectID = null;
     ID localContainerID = null;
     
     public SharedObjectManagerRemoveEvent(ID localContainerID, ID sharedObjectID) {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
index 1bb95b461..a727df7b4 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/GUID.java
@@ -24,6 +24,8 @@ import org.eclipse.ecf.core.util.Base64;
  */
 public class GUID extends StringID {
 
+	private static final long serialVersionUID = 3545794369039972407L;
+
 	public static class Creator implements IDInstantiator {
 		public ID makeInstance(Namespace ns, Class[] argTypes, Object[] args)
 				throws IDInstantiationException {
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDInstantiationException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDInstantiationException.java
index 8ce863a71..0a5c67220 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDInstantiationException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/IDInstantiationException.java
@@ -13,7 +13,9 @@ import org.eclipse.ecf.core.util.ECFException;
 
 public class IDInstantiationException extends ECFException {
 
-    public IDInstantiationException() {
+	private static final long serialVersionUID = 3258416140119323960L;
+
+	public IDInstantiationException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
index af97fbc94..8b5345678 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/LongID.java
@@ -16,7 +16,9 @@ import org.eclipse.ecf.core.identity.provider.IDInstantiator;
 
 public class LongID extends BaseID {
 
-    Long value = null;
+	private static final long serialVersionUID = 4049072748317914423L;
+
+	Long value = null;
 
     public static class Creator implements IDInstantiator {
         public ID makeInstance(Namespace ns, Class[] argTypes, Object[] args)
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
index 1ad36bee9..855ecef98 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/NamespacePermission.java
@@ -14,7 +14,8 @@ import java.security.Permission;
 
 public class NamespacePermission extends BasicPermission {
 
-    public static final String ADD_NAMESPACE = "add";
+	private static final long serialVersionUID = 3257004371500806969L;
+	public static final String ADD_NAMESPACE = "add";
     public static final String ALL_NAMESPACE = "all";
     public static final String CONTAINS_NAMESPACE = "contains";
     public static final String GET_NAMESPACE = "get";
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
index ad87df152..f8b6df7f8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/identity/StringID.java
@@ -21,7 +21,8 @@ import org.eclipse.ecf.core.identity.provider.IDInstantiator;
  */
 public class StringID extends BaseID {
 
-    public static class Creator implements IDInstantiator {
+	private static final long serialVersionUID = 3256437019155446068L;
+	public static class Creator implements IDInstantiator {
         public ID makeInstance(Namespace ns, Class[] argTypes, Object[] args)
                 throws IDInstantiationException {
             return new StringID(ns, (String) args[0]);
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IJoinContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IJoinAuthorizationContext.java
index 3b7c89ec6..96459513b 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IJoinContext.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/IJoinAuthorizationContext.java
@@ -7,11 +7,18 @@
  * Contributors: Composent, Inc. - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.ecf.core;
+package org.eclipse.ecf.core.security;
 
 import javax.security.auth.callback.CallbackHandler;
 
-public interface IJoinContext {
-	public Object [] getRawParameters();
+public interface IJoinAuthorizationContext {
+	/**
+	 * Get the callbackhandler instance used by the provider to
+	 * callback into application code.  The provider will typically use the
+	 * callback handler to provide a set of callbacks for getting/retrieving
+	 * authorization info
+	 * 
+	 * @return CallbackHandler
+	 */
 	public CallbackHandler getCallbackHandler();
 }
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java
new file mode 100644
index 000000000..87e07c3ee
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/security/ObjectCallback.java
@@ -0,0 +1,18 @@
+package org.eclipse.ecf.core.security;
+
+import javax.security.auth.callback.Callback;
+
+public class ObjectCallback implements Callback {
+	Object data;
+	
+	public ObjectCallback(Object val) {
+		this.data = val;
+	}
+	
+	public void setData(Object val) {
+		this.data = val;
+	}
+	public Object getData() {
+		return this.data;
+	}
+}
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java
index c7f815583..a37746b3a 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java
@@ -18,6 +18,7 @@ import org.eclipse.ecf.core.user.IUser;
 
 public class User implements IUser {
 
+	private static final long serialVersionUID = 3978709484518586169L;
 	protected ID id;
 	protected String name;
 	protected Map properties;
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ECFException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ECFException.java
index ca0c65e52..6f8a11ea8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ECFException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ECFException.java
@@ -11,7 +11,9 @@ package org.eclipse.ecf.core.util;
 
 public class ECFException extends Exception {
 
-    public ECFException() {
+	private static final long serialVersionUID = 3256440309134406707L;
+
+	public ECFException() {
         super();
     }
 
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
index 77c280f7a..c8911f3fe 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/QueueException.java
@@ -11,7 +11,8 @@ package org.eclipse.ecf.core.util;
 
 public class QueueException extends ECFException {
 
-    IQueue theQueue = null;
+	private static final long serialVersionUID = 3691039863709118774L;
+	IQueue theQueue = null;
 
     public QueueException() {
         super();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/TimeoutException.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/TimeoutException.java
index 24fc19d8a..3535f07a8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/TimeoutException.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/TimeoutException.java
@@ -11,7 +11,8 @@ package org.eclipse.ecf.core.util;
 
 public class TimeoutException extends InterruptedException {
 
-    public final long duration;
+	private static final long serialVersionUID = 3256439218179158322L;
+	public final long duration;
     public TimeoutException(long time) {
         duration = time;
     }