Removed code from server plugin

7 files changed, 1 insertions, 169 deletions

diff --git a/server-side/bundles/org.eclipse.ecf.server/.settings/org.eclipse.core.resources.prefs b/server-side/bundles/org.eclipse.ecf.server/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3a6bc1773..000000000
--- a/server-side/bundles/org.eclipse.ecf.server/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Feb 20 21:09:02 PST 2006
-eclipse.preferences.version=1
-encoding//src/org/eclipse/ecf/server/config.properties=8859_1
diff --git a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
index 1cbe1ad80..b69f49805 100644
--- a/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
+++ b/server-side/bundles/org.eclipse.ecf.server/META-INF/MANIFEST.MF
@@ -9,10 +9,7 @@ Bundle-Localization: plugin
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4,
  CDC-1.1/Foundation-1.1
-Require-Bundle: org.eclipse.ecf,
- org.eclipse.ecf.provider,
- org.eclipse.ecf.sharedobject
-Export-Package: org.eclipse.ecf.server
+Require-Bundle: org.eclipse.ecf
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.osgi.util;version="1.0.0",
  org.osgi.framework;version="1.3.0"
diff --git a/server-side/bundles/org.eclipse.ecf.server/conf/server.xml b/server-side/bundles/org.eclipse.ecf.server/conf/server.xml
deleted file mode 100644
index d39048dd5..000000000
--- a/server-side/bundles/org.eclipse.ecf.server/conf/server.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<server>
-	<connector protocol="ecftcp"  hostname="localhost" port="3282" timeout="30000">
-		<group name="server"/>
-	</connector>
-</server>
\ No newline at end of file
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
index 9948b6aca..12401105b 100644
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
+++ b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/internal/server/Activator.java
@@ -11,12 +11,9 @@
 
 package org.eclipse.ecf.internal.server;
 
-import java.net.URL;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.ecf.server.Config;
-import org.eclipse.ecf.server.ECFTCPServerStartup;
 import org.osgi.framework.BundleContext;
 
 /**
@@ -27,8 +24,6 @@ public class Activator extends Plugin {
 	//The shared instance.
 	private static Activator plugin;
 	
-	ECFTCPServerStartup servers;
-	
 	/**
 	 * The constructor.
 	 */
@@ -41,18 +36,6 @@ public class Activator extends Plugin {
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
-		startServers(context.getBundle().getEntry(Config.serverconfigfile));
-	}
-
-	private void startServers(URL anURL) {
-		if (servers == null) {
-			try {
-				if (anURL != null) servers = new ECFTCPServerStartup(anURL.openStream());
-				else servers = new ECFTCPServerStartup("server.xml"); //$NON-NLS-1$
-			} catch (Exception e) {
-				Activator.log("Exception starting ecf tcp servers",e); //$NON-NLS-1$
-			}
-		}
 	}
 
 	/**
@@ -60,17 +43,9 @@ public class Activator extends Plugin {
 	 */
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
-		stopServers();
 		plugin = null;
 	}
 
-	private void stopServers() {
-		if (servers != null) {
-			servers.destroyServers();
-			servers = null;
-		}
-	}
-
 	/**
 	 * Returns the shared instance.
 	 *
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Config.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Config.java
deleted file mode 100644
index 0e673b183..000000000
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/Config.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/****************************************************************************
-* Copyright (c) 2004 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;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Config extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ecf.server.config"; //$NON-NLS-1$
-	private Config() {
-	}
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Config.class);
-	}
-	public static String serverconfigfile;
-}
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java
deleted file mode 100644
index 7371252e5..000000000
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/ECFTCPServerStartup.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-* Copyright (c) 2004 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;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.identity.IDFactory;
-import org.eclipse.ecf.core.identity.IDCreateException;
-import org.eclipse.ecf.internal.server.Activator;
-import org.eclipse.ecf.provider.app.Connector;
-import org.eclipse.ecf.provider.app.NamedGroup;
-import org.eclipse.ecf.provider.app.ServerConfigParser;
-import org.eclipse.ecf.provider.generic.SOContainerConfig;
-import org.eclipse.ecf.provider.generic.TCPServerSOContainer;
-import org.eclipse.ecf.provider.generic.TCPServerSOContainerGroup;
-
-public class ECFTCPServerStartup {
-	static TCPServerSOContainerGroup serverGroups[] = null;
-	static List servers = new ArrayList();
-	public ECFTCPServerStartup(String configFileName) throws Exception {
-		InputStream ins = this.getClass().getResourceAsStream(configFileName);
-		if (ins != null) {
-			createServers(ins);
-		} else throw new NullPointerException("config file "+configFileName+" not found");
-	}
-	
-	public ECFTCPServerStartup(InputStream ins) throws Exception {
-		if (ins != null) createServers(ins);
-		else throw new NullPointerException("config not found");
-	}
-	protected boolean isActive() {
-		return (servers.size() > 0);
-	}
-	public synchronized void destroyServers() {
-		for (Iterator i = servers.iterator(); i.hasNext();) {
-			TCPServerSOContainer s = (TCPServerSOContainer) i.next();
-			if (s != null) {
-				try {
-					s.dispose();
-				} catch (Exception e) {
-					Activator.log("Exception destroying server "
-							+ s.getConfig().getID());
-				}
-			}
-		}
-		servers.clear();
-		if (serverGroups != null) {
-			for (int i = 0; i < serverGroups.length; i++) {
-				serverGroups[i].takeOffTheAir();
-			}
-			serverGroups = null;
-		}
-	}
-	protected synchronized void createServers(InputStream ins) throws Exception {
-		ServerConfigParser scp = new ServerConfigParser();
-		List connectors = scp.load(ins);
-		if (connectors != null) {
-			serverGroups = new TCPServerSOContainerGroup[connectors.size()];
-			int j = 0;
-			for (Iterator i = connectors.iterator(); i.hasNext();) {
-				Connector connect = (Connector) i.next();
-				serverGroups[j] = createServerGroup(connect.getHostname(),
-						connect.getPort());
-				List groups = connect.getGroups();
-				for (Iterator g = groups.iterator(); g.hasNext();) {
-					NamedGroup group = (NamedGroup) g.next();
-					TCPServerSOContainer cont = createServerContainer(group
-							.getIDForGroup(), serverGroups[j], group.getName(),
-							connect.getTimeout());
-					servers.add(cont);
-					log("ECF server created: "
-							+ cont.getConfig().getID().getName());
-				}
-				serverGroups[j].putOnTheAir();
-				j++;
-			}
-		}
-	}
-	protected void log(String output) {
-		System.out.println(output);
-	}
-	protected TCPServerSOContainerGroup createServerGroup(String name, int port) {
-		TCPServerSOContainerGroup group = new TCPServerSOContainerGroup(name,
-				port);
-		return group;
-	}
-	protected TCPServerSOContainer createServerContainer(String id,
-			TCPServerSOContainerGroup group, String path, int keepAlive)
-			throws IDCreateException {
-		ID newServerID = IDFactory.getDefault().createStringID(id);
-		SOContainerConfig config = new SOContainerConfig(newServerID);
-		return new TCPServerSOContainer(config, group, path, keepAlive);
-	}
-}
diff --git a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/config.properties b/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/config.properties
deleted file mode 100644
index 3c706ab35..000000000
--- a/server-side/bundles/org.eclipse.ecf.server/src/org/eclipse/ecf/server/config.properties
+++ /dev/null
@@ -1 +0,0 @@
-serverconfigfile=conf/server.xml