removed classes, which shouldn't be part of the server in yalp2.0

git-svn-id: http://manut.eu/svn/yalp/trunk@4 f059d3a0-6783-47b7-97ff-1fe0bbf25129

5 files changed, 12 insertions, 78 deletions

diff --git a/src/YalpServer/FileBrowser.java b/removed-code/FileBrowser.java
index 2f2a3a5..2f2a3a5 100755
--- a/src/YalpServer/FileBrowser.java
+++ b/removed-code/FileBrowser.java
diff --git a/src/YalpServer/FileFinder.java b/removed-code/FileFinder.java
index 2d6527c..2d6527c 100755
--- a/src/YalpServer/FileFinder.java
+++ b/removed-code/FileFinder.java
diff --git a/src/YalpServer/FileInfoManager.java b/removed-code/FileInfoManager.java
index 34fe49b..34fe49b 100755
--- a/src/YalpServer/FileInfoManager.java
+++ b/removed-code/FileInfoManager.java
diff --git a/src/YalpServer/InitServer.java b/src/YalpServer/InitServer.java
index ac9d507..a5f7c99 100755
--- a/src/YalpServer/InitServer.java
+++ b/src/YalpServer/InitServer.java
@@ -12,7 +12,6 @@
 package YalpServer;
 
 import java.net.Inet4Address;
-import java.net.MalformedURLException;
 import java.net.UnknownHostException;
 
 import java.beans.XMLDecoder;
@@ -29,8 +28,6 @@ import java.util.Properties;
 
 import java.security.*;
 
-import java.sql.SQLException;
-
 import org.omg.CosNaming.*;
 import org.omg.CosNaming.NamingContextPackage.*;
 import org.omg.CORBA.*;
@@ -62,7 +59,6 @@ public class InitServer {
 	private String[] orbArgs;
 	private POA poa;
 	private String serverIP;
-	private ArrayList<FileBrowser> browseList;
 
 	/*
 	 *  Constructor: starts Server initialization
@@ -72,8 +68,6 @@ public class InitServer {
 		loadConfig("ServerSettings.xml");
 		writeConfig("ServerSettings.xml");
 
-		this.browseList = new ArrayList<FileBrowser>();
-
 		this.orbArgs = _orbArgs; // t.b.d. read orbargs from config xml
 
 		try {
@@ -211,73 +205,4 @@ public class InitServer {
 		this.settings = set;
 		return this.writeConfig("ServerConfiguration.xml");
 	}
-
-/*
- * t.b.d. session management
- *
- * Client logon (give him,his fileBrowser)
- *
- * @param ipAdress
- * 	of the Client
- * @param userName
- * 	using the Client
- *
-
-	public void newClient(String ipAdress,String userName) {
-		this.browseList.add( new FileBrowser( this.settings.startDir,
-																					ipAdress,
-																					userName ) );
-	}
- */
-
-/*
- * Client logoff (free memory of his fileBrowser
- *
- * @param ipAdress
- * 	of the Client
- * @param userName
- * 	using the Client
- */
-
-	public void remClient(String ipAdress, String userName) {
-		for( FileBrowser aBrowser : this.browseList ) {
-			if( aBrowser.getOwner().equals(ipAdress) &&
-					aBrowser.getUserName().equals(userName) ) {
-				this.browseList.remove(aBrowser);
-				break;
-			}
-		}
-	}
-
-/*
- * change Directory in fileBrowser
- *
- * @param ip
- * 	of the Client
- * @param dir
- * 	to which should be changed
- * @return ArrayList<YalpFile>
- * 	 content of the directory changed to
- */
-
-	public ArrayList<YalpFile> changeDir(String ip, String dir) {
-		FileBrowser aBrowser = null;
-		for(FileBrowser oneMoreBrowser : this.browseList) {
-			if( oneMoreBrowser.getOwner().equals(ip) ) {
-				oneMoreBrowser.changeDir(dir);
-				aBrowser = oneMoreBrowser;
-				break;
-			}
-		}
-		return aBrowser.getFiles();
-	}
-
-/*
- * Server Shutdown
- */
-
-	public void serverShutdown() {
-		System.out.println("Server shutdown - Server is going down");
-		System.exit(0);
-	}
 }
diff --git a/src/YalpServer/ServerControlImpl.java b/src/YalpServer/ServerControlImpl.java
index a88445a..0f33ff6 100755
--- a/src/YalpServer/ServerControlImpl.java
+++ b/src/YalpServer/ServerControlImpl.java
@@ -80,10 +80,19 @@ public ServerControlImpl() {
 			session.value = new Session();

 			session.value.id = 666;

 			session.value.me = new YalpUser();

+			session.value.me.id = 333;

+			session.value.me.name = userName;

+			session.value.me.realName = "huhu";

 			session.value.me.level = AccessRights.ADMIN;

+			session.value.ip = "127.0.0.1";

+			session.value.availablePlugins = new PluginInfo[0];

 

-			err.value = new YalpError();

-			err.value.code = YalpErrorCode.OK;

+			YalpError error = new YalpError();

+			error.code = YalpErrorCode.OK;

+			error.descr = "no error";

+			error.level = YalpErrorLevel.ERROR_LEVEL_DEBUG;

+			error.msg = "";

+			err.value = error;

 

 		} catch (Exception e) {

 			System.out.println(e.toString());

@@ -99,7 +108,7 @@ public ServerControlImpl() {
  */

 	public void clientLogoff( Session bye, YalpErrorHolder err) {

 		logger.debug("clientLogoff");

-		srv.remClient( bye.ip, bye.me.name );

+		// srv.remClient( bye.ip, bye.me.name );

 		YalpError error = new YalpError();

 		error.code = YalpErrorCode.OK;

 		err = new YalpErrorHolder(error);