Refactored org.eclipse.ecf.server.generic for ease of use.

3 files changed, 9 insertions, 6 deletions

diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java
index adb9d4596..406a93050 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java
@@ -1,5 +1,7 @@
 package org.eclipse.ecf.internal.server.generic;
 
+import org.eclipse.ecf.server.generic.GenericServerContainerGroupFactory;
+
 import org.eclipse.core.runtime.*;
 import org.eclipse.ecf.core.IContainerManager;
 import org.eclipse.ecf.core.util.LogHelper;
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroup.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroup.java
index 789d53407..c8377e626 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroup.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroup.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/internal/server/generic/GenericServerContainerGroupFactory.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroupFactory.java
index 481a3927c..2693660d9 100644
--- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/GenericServerContainerGroupFactory.java
+++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/GenericServerContainerGroupFactory.java
@@ -7,12 +7,14 @@
 * Contributors:
 *   Composent, Inc. - initial API and implementation
 ******************************************************************************/
-package org.eclipse.ecf.internal.server.generic;
+package org.eclipse.ecf.server.generic;
 
 import java.util.*;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.ecf.server.generic.*;
 
+/**
+ * @since 6.0
+ */
 public class GenericServerContainerGroupFactory implements IGenericServerContainerGroupFactory {
 
 	class SCGData {
@@ -61,7 +63,7 @@ public class GenericServerContainerGroupFactory implements IGenericServerContain
 		}
 	}
 
-	boolean isSSLTransportSpecified(Map defaultContainerProperties) {
+	protected boolean isSSLTransportSpecified(Map defaultContainerProperties) {
 		boolean sslTransport = false;
 		if (defaultContainerProperties != null) {
 			Object sslTransportPropValue = defaultContainerProperties.get(IGenericServerContainerGroupFactory.SSLTRANSPORT_CONTAINER_PROP);
@@ -78,8 +80,7 @@ public class GenericServerContainerGroupFactory implements IGenericServerContain
 	 * @throws GenericServerContainerGroupCreateException  
 	 */
 	protected IGenericServerContainerGroup createGenericServerContainerGroup(SCGData scgdata, Map defaultContainerProperties) throws GenericServerContainerGroupCreateException {
-		boolean sslTransport = isSSLTransportSpecified(defaultContainerProperties);
-		if (sslTransport)
+		if (isSSLTransportSpecified(defaultContainerProperties))
 			return new SSLGenericServerContainerGroup(scgdata.getHostname(), scgdata.getPort(), defaultContainerProperties);
 		return new GenericServerContainerGroup(scgdata.getHostname(), scgdata.getPort(), defaultContainerProperties);
 	}