Fixes for minor bugs. Plus refactoring of classnames for SSL* classes.

11 files changed, 34 insertions, 25 deletions

diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractSSLGenericServer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLAbstractGenericServer.java
index 400a1f4a0..2ee4ed9a0 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractSSLGenericServer.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLAbstractGenericServer.java
@@ -1,3 +1,12 @@
+/*******************************************************************************
+* Copyright (c) 2013 Composent, Inc. and others. 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:
+*   Composent, Inc. - initial API and implementation
+******************************************************************************/
 package org.eclipse.ecf.server.generic;
 
 import java.io.IOException;
@@ -13,11 +22,11 @@ import org.eclipse.ecf.provider.generic.*;
 /**
  * @since 6.0
  */
-public abstract class AbstractSSLGenericServer {
+public abstract class SSLAbstractGenericServer {
 
 	protected SSLServerSOContainerGroup serverGroup;
 
-	public AbstractSSLGenericServer(String host, int port) {
+	public SSLAbstractGenericServer(String host, int port) {
 		this.serverGroup = new SSLServerSOContainerGroup(host, port);
 	}
 
@@ -64,7 +73,7 @@ public abstract class AbstractSSLGenericServer {
 		}
 		List servers = getServerContainers();
 		for (Iterator i = servers.iterator(); i.hasNext();) {
-			GenericServerContainer s = (GenericServerContainer) i.next();
+			SSLGenericServerContainer s = (SSLGenericServerContainer) i.next();
 			s.ejectAllGroupMembers("Shutting down immediately"); //$NON-NLS-1$
 			s.dispose();
 		}
@@ -80,7 +89,7 @@ public abstract class AbstractSSLGenericServer {
 		SSLGenericServerContainer s = new SSLGenericServerContainer(this, createServerConfig(path), serverGroup, path, keepAlive);
 		IContainerManager containerManager = Activator.getDefault().getContainerManager();
 		if (containerManager != null) {
-			ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.server.secure"); //$NON-NLS-1$
+			ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.secure.server"); //$NON-NLS-1$
 			containerManager.addContainer(s, ctd);
 		}
 		IConnectHandlerPolicy policy = createConnectHandlerPolicy(s, path);
@@ -102,7 +111,7 @@ public abstract class AbstractSSLGenericServer {
 	protected IConnectHandlerPolicy createConnectHandlerPolicy(SSLGenericServerContainer s, String path) {
 		return new IConnectHandlerPolicy() {
 			public PermissionCollection checkConnect(Object address, ID fromID, ID targetID, String targetGroup, Object connectData) throws Exception {
-				return AbstractSSLGenericServer.this.checkConnect(address, fromID, targetID, targetGroup, connectData);
+				return SSLAbstractGenericServer.this.checkConnect(address, fromID, targetID, targetGroup, connectData);
 			}
 
 			public void refresh() {
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainer.java
index b4cd584ef..bc9a5505f 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainer.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
+* Copyright (c) 2013 Composent, Inc. and others. 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
@@ -20,12 +20,12 @@ import org.eclipse.ecf.provider.generic.SSLServerSOContainerGroup;
 
 /**
  * 
- * @since 5.2
+ * @since 6.0
  *
  */
 public class SSLGenericServerContainer extends SSLServerSOContainer {
 
-	final AbstractSSLGenericServer abstractGenericServer;
+	final SSLAbstractGenericServer abstractGenericServer;
 
 	private IContainerListener departedListener = new IContainerListener() {
 		public void handleEvent(IContainerEvent event) {
@@ -39,7 +39,7 @@ public class SSLGenericServerContainer extends SSLServerSOContainer {
 		}
 	};
 
-	public SSLGenericServerContainer(AbstractSSLGenericServer abstractGenericServer, ISharedObjectContainerConfig config, SSLServerSOContainerGroup listener, String path, int keepAlive) {
+	public SSLGenericServerContainer(SSLAbstractGenericServer abstractGenericServer, ISharedObjectContainerConfig config, SSLServerSOContainerGroup listener, String path, int keepAlive) {
 		super(config, listener, path, keepAlive);
 		this.abstractGenericServer = abstractGenericServer;
 		addListener(departedListener);
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainerGroup.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainerGroup.java
index 27e5ebf43..75594a24a 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainerGroup.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLGenericServerContainerGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2010 Composent, Inc. and others. All rights reserved. This
+* Copyright (c) 2013 Composent, Inc. and others. 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
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SimpleSSLGenericServer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLSimpleGenericServer.java
index 00b40ad9d..d3355fac5 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SimpleSSLGenericServer.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/SSLSimpleGenericServer.java
@@ -1,11 +1,11 @@
 /*******************************************************************************
-* Copyright (c) 2009 EclipseSource and others. All rights reserved. This
+* Copyright (c) 2013 Composent, Inc. and others. 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:
-*   EclipseSource - initial API and implementation
+*   Composent, Inc. - initial API and implementation
 ******************************************************************************/
 package org.eclipse.ecf.server.generic;
 
@@ -14,9 +14,9 @@ import org.eclipse.ecf.core.identity.ID;
 /**
  * @since 6.0
  */
-public class SimpleSSLGenericServer extends AbstractSSLGenericServer {
+public class SSLSimpleGenericServer extends SSLAbstractGenericServer {
 
-	public SimpleSSLGenericServer(String host, int port) {
+	public SSLSimpleGenericServer(String host, int port) {
 		super(host, port);
 	}
 
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/AbstractSSLGenericClientApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLAbstractGenericClientApplication.java
index 401fe7431..10c9843f6 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/AbstractSSLGenericClientApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLAbstractGenericClientApplication.java
@@ -18,7 +18,7 @@ import org.eclipse.ecf.provider.generic.SSLServerSOContainer;
 /**
  * @since 6.0
  */
-public abstract class AbstractSSLGenericClientApplication {
+public abstract class SSLAbstractGenericClientApplication {
 
 	protected String connectTarget;
 	protected ISharedObjectContainer clientContainer;
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/AbstractSSLGenericServerApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLAbstractGenericServerApplication.java
index 51492580e..28756c96b 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/AbstractSSLGenericServerApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLAbstractGenericServerApplication.java
@@ -24,7 +24,7 @@ import org.eclipse.ecf.provider.generic.*;
 /**
  * @since 6.0
  */
-public abstract class AbstractSSLGenericServerApplication {
+public abstract class SSLAbstractGenericServerApplication {
 
 	protected SSLServerSOContainerGroup[] serverGroups;
 
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientApplication.java
index 2aea2b91e..e3c6ec8b2 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientApplication.java
@@ -22,9 +22,9 @@ import org.eclipse.equinox.app.IApplicationContext;
 /**
  * @since 6.0
  */
-public class SSLGenericClientApplication extends AbstractSSLGenericClientApplication implements IApplication {
+public class SSLGenericClientApplication extends SSLAbstractGenericClientApplication implements IApplication {
 
-	private static final String GENERIC_CLIENT_CONTAINER_TYPE = "ecf.generic.client.secure"; //$NON-NLS-1$
+	private static final String GENERIC_CLIENT_CONTAINER_TYPE = "ecf.generic.secure.client"; //$NON-NLS-1$
 
 	protected final Object appLock = new Object();
 	protected boolean done = false;
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientJavaApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientJavaApplication.java
index ac68ad511..9cf06c3a0 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientJavaApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericClientJavaApplication.java
@@ -16,12 +16,12 @@ import org.eclipse.ecf.provider.generic.SSLGenericContainerInstantiator;
 /**
  * @since 6.0
  */
-public class SSLGenericClientJavaApplication extends AbstractSSLGenericClientApplication {
+public class SSLGenericClientJavaApplication extends SSLAbstractGenericClientApplication {
 
 	protected ISharedObjectContainer createContainer() throws ContainerCreateException {
 		IContainerFactory containerFactory = ContainerFactory.getDefault();
-		containerFactory.addDescription(new ContainerTypeDescription("ecf.generic.client.secure", new SSLGenericContainerInstantiator(), null)); //$NON-NLS-1$
-		return (ISharedObjectContainer) containerFactory.createContainer("ecf.generic.client.secure"); //$NON-NLS-1$
+		containerFactory.addDescription(new ContainerTypeDescription("ecf.generic.secure.client", new SSLGenericContainerInstantiator(), null)); //$NON-NLS-1$
+		return (ISharedObjectContainer) containerFactory.createContainer("ecf.generic.secure.client"); //$NON-NLS-1$
 	}
 
 	public static void main(String[] args) throws Exception {
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServer.java
index 1a5d685bb..5b8285e7c 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServer.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServer.java
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2007 Composent, Inc. and others.
+ * Copyright (c) 2013 Composent, Inc. and others.
  * 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
@@ -187,7 +187,7 @@ public class SSLGenericServer implements IApplication {
 				System.out.println("Taking " + serverGroup.getName() + ":" + serverGroup.getPort() + " off the air"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				final Iterator iter = serverGroup.elements();
 				for (; iter.hasNext();) {
-					final TCPServerSOContainer container = (TCPServerSOContainer) iter.next();
+					final SSLServerSOContainer container = (SSLServerSOContainer) iter.next();
 					container.dispose();
 				}
 			}
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerApplication.java
index 07fffc258..d89dd3b5d 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerApplication.java
@@ -17,7 +17,7 @@ import org.eclipse.equinox.app.IApplicationContext;
 /**
  * @since 6.0
  */
-public class SSLGenericServerApplication extends AbstractSSLGenericServerApplication implements IApplication {
+public class SSLGenericServerApplication extends SSLAbstractGenericServerApplication implements IApplication {
 
 	protected final Object appLock = new Object();
 	protected boolean done = false;
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerJavaApplication.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerJavaApplication.java
index d2c96248a..02c72f6a0 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerJavaApplication.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/app/SSLGenericServerJavaApplication.java
@@ -12,7 +12,7 @@ package org.eclipse.ecf.server.generic.app;
 /**
  * @since 6.0
  */
-public class SSLGenericServerJavaApplication extends AbstractSSLGenericServerApplication {
+public class SSLGenericServerJavaApplication extends SSLAbstractGenericServerApplication {
 
 	/**
 	 * @param args