removed old files, added final versions of.java files -- done

Author: lefterisloukas

EchoServer.class

@@ -1,3 +1,5 @@
+//package ce325.hw2;
+
 import java.net.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -33,7 +35,7 @@ public void run(){
 			remoteAd= curReq.remoteAd;
 			out=curReq.outStream;
 			data=curReq.dataStream;
-			
+			System.out.println(Thread.currentThread().getName()+" ->req : "+request+"\n");
 			//various declarations
 			String readFile;
 			String codeStatus;
@@ -79,19 +81,7 @@ else if (parts[2].equals("HTTP/1.0") ){
 
 				//Creates file object for the currently asked file
 				File filepath= new File (mainServer.ROOT + parts[1]);
-				
-				//example:get the ".mp3" extension part from a file if it is "AmyWinehouse.mp3" 
-				try{
-					int index = parts[1].lastIndexOf('.');
-					extensionForMime= parts[1].substring(index);
-				}catch (Exception Ex){
-					StringWriter sw = new StringWriter();
-					Ex.printStackTrace(new PrintWriter(sw));
-					String exceptionAsString = sw.toString();
-					writeErrorLog(reqLog,exceptionAsString,remoteAd);
-				}
-					
-					
+	
 				/*Use info to check for protocol errors*/
 
 				/*
@@ -101,6 +91,7 @@ else if (parts[2].equals("HTTP/1.0") ){
 				if(!parts[0].equals("GET")){ 
 					codeStatus = "405 Method Not Allowed";
 					writeAccessLog(reqLog,userStr,codeStatus);
+					System.out.println("405 error written in log \n");
 					responseForError(codeStatus,out);
 				}
 				/*
@@ -110,14 +101,16 @@ else if (parts[2].equals("HTTP/1.0") ){
 				else if(!filepath.exists()){
 					codeStatus = "404 File Not Found";
 					writeAccessLog(reqLog,userStr,codeStatus);
+					System.out.println("404 error written in log \n");
 					responseForError(codeStatus,out);
 				}
 				/*
 				ERROR 400 Bad Request 
 				*/
 				else if((parts[2]== null ) ||( !(parts[2].equals("HTTP/1.1")) && !(parts[2].equals("HTTP/1.0")) ) ){
 					codeStatus = "400 Bad Request";
-					writeAccessLog(reqLog,userStr,codeStatus);
+					writeAccessLog(reqLog,userStr,codeStatus);				
+					System.out.println("400 error written in log \n");
 					responseForError(codeStatus,out);
 				}
 				//else 200 OK ,proceeds to send response
@@ -138,9 +131,21 @@ else if((parts[2]== null ) ||( !(parts[2].equals("HTTP/1.1")) && !(parts[2].equa
 						writeErrorLog(reqLog,exceptionAsString,remoteAd);
 					}
 
-					synchronized (this){
+					synchronized (this){ //remove it 
+					
 					// if it is a FILE, write to acces log and then send it
 					if (filepath.isFile() ) {
+						//example:get the ".mp3" extension part from a file if it is "AmyWinehouse.mp3" 
+						try{
+							int index = parts[1].lastIndexOf('.');
+							extensionForMime= parts[1].substring(index);
+						}catch (Exception Ex){
+							StringWriter sw = new StringWriter();
+							Ex.printStackTrace(new PrintWriter(sw));
+							String exceptionAsString = sw.toString();
+							writeErrorLog(reqLog,exceptionAsString,remoteAd);
+						}
+						
 						writeAccessLog(reqLog,userStr,codeStatus);
 						sendFile( versionOfHttp, out,  filepath,  extensionForMime,  data);
 					}
@@ -169,12 +174,8 @@ else if (filepath.isDirectory() ) {
 						}
 						else {//else, show the existing directory -> sendDirectory
 							try {
-								
 									writeAccessLog(reqLog,userStr,codeStatus);
 									sendDirectory(filepath,out);
-								
-								
-								
 							}
 							catch (Exception E){
 								StringWriter sw = new StringWriter();
@@ -200,7 +201,7 @@ else if (filepath.isDirectory() ) {
 
 				writeErrorLog(reqLog,exceptionAsString,remoteAd);
 				writeAccessLog(reqLog,userStr,codeStatus);
-				
+				System.out.println("500 error written in log \n");
 				responseForError(codeStatus,out);
 			}	
 
@@ -513,6 +514,7 @@ synchronized public static void sendDirectory(File filepath, PrintWriter out) th
 			html.append( "<td valign=\"top\"><a href=\""+extensionForLocalHost+"\">"+file.getName()+"</a></td> ");
 			html.append( "<td valign=\"top\">"+(file.isDirectory() ? "- " : getFileSize(file) )+"</td>");
 			html.append( "<td valign=\"top\">"+getLastModifiedDate(file.lastModified())+"</td> </tr>\r\n ");
+			counterF=counterF-1;
 		}
 
 

EchoServer.java

@@ -1,3 +1,5 @@
+//package ce325.hw2;
+
 import java.net.*;
 import java.io.*;
 import java.util.concurrent.*;
@@ -7,25 +9,27 @@
 import java.nio.file.Files;
 
 
+
 public class mainServer{
 
 //public variables/fields for other classes and concurrency 
 
-	/*declare here variables that will be  taken from xml for server "initialization"*/
+	//declare variables that will be taken from xml for server "initialization"
 	public static String SERVERNAME = "CE325 (Java based server)";
-	//public static String ROOT ="C:\\root\\";   //Our files for the WebServer exist inside this folder
-	public static String ROOT;// =  xmlParser.getRootDirectory();
-	public static File ROOTPATH ;//= new File (ROOT);
-	//public static int  portNumber = 8000;
-	public static int portNumber ;//= xmlParser.getListenPort();
+	public static String ROOT;
+	public static File ROOTPATH ;
+	public static int portNumber ;
 	public static int statPortNumber;
+	
 	//Text files for logs
 	public static String ACCESS;
 	public static String ERROR;
 	public static File ACCESSPATH;
 	public static File ERRORPATH;
+	
 	//streams to write in logs
 	public static PrintWriter writerAccess,writerError;
+	
 	//blocking queue for request objects
 	public static BlockingQueue<reqOb> msgQ = new ArrayBlockingQueue<reqOb>(10);
 
@@ -37,10 +41,16 @@ public class mainServer{
 	public static volatile int countCons=0; //+1: in clientThread, line 246
 	public static volatile int countErrors=0; //+1: in clientThread, line 256
 
+	
+	//etc
+	public static Socket clientSocket;
+	public static BufferedReader in ;
+	
 	public static void main(String[] args) throws IOException, BindException, InterruptedException{
 
+		//init 
 		String request="",inputLine="",userStr="",remoteAd="";
-		BufferedReader in = null;
+		//BufferedReader in = null;
 		PrintWriter out = null;
 		OutputStream data =null;
 
@@ -74,52 +84,72 @@ public static void main(String[] args) throws IOException, BindException, Interr
 		//create a serverSocket, using the given port
 		ServerSocket serverSocket = new ServerSocket(portNumber); 
 
-		//initiate thread for statistics port, code in statThread class
+		//initiate thread for statistics port, code inside statThread class
 		statThread statistics= new statThread();
 		statistics.start();
-		//initiate thread for sending response to server port, code in clientThread class
+		
+		/*
+		initiate 2 concurrent workers-threads
+		for sending response to server port, code in clientThread class
+		*/
 		clientThread t1= new clientThread();
 		t1.start();
+		
+		//Uncomment the following if you want to have 2 workers and test the concurrency
+		/*
 		clientThread t2= new clientThread();
 		t2.start();
-		
+		*/
 
 
 		while(true ){ //run forever
 
 			 /*
-				create a socket(clientSocket) for the client, connect them to the Server and then create:
-				1 InputStream 	: BufferedReader in
-				2 OutputStreams : PrintWriter out ( for the HTTP Response) , OutputStream data( for file sending)
-				*/
-			Socket clientSocket = serverSocket.accept();   
+			create a socket(clientSocket) for the client, connect them to the Server and then create:
+			1 InputStream 	: BufferedReader in
+			2 OutputStreams : PrintWriter out ( for the HTTP Response) , OutputStream data( for file sending)
+			*/
+			//Socket 
+			clientSocket = serverSocket.accept();   
 			remoteAd =clientSocket.getRemoteSocketAddress().toString();
 			in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream())); 
 			out = new PrintWriter(clientSocket.getOutputStream(), true);
 			data = new BufferedOutputStream( clientSocket.getOutputStream());
+			
 			try{
+				
 				//GET HTTP REQUEST from client
 				 while ((inputLine = in.readLine()) != null) {
 					if (inputLine.startsWith("GET")){
-						request=request + inputLine+"\n";
+						request=request + inputLine+"\n"; //1st line of GET request
 					}
 					else if(inputLine.startsWith("User")){
-						userStr=userStr + inputLine+"\n";
+						userStr=userStr + inputLine+"\n"; //User-Agent Line of GET request 
 					}
-					else if(inputLine.startsWith("Accept")){
+					else if(inputLine.startsWith("Accept")){ 
 						break;
 					}
 				}
 				/*	
 				Send (1st line of) GET REQUEST to send 
 				the appropriate response to our client
 				*/
-				if (  (request!="" )&&(request!= null)  ) {
+				if (  (request!="" ) && (request!= null)  ) {
 					try{
+						
 						//put the info for the specific request in queue
 
+						/*
+						Now, we insert all the required data for the response inside a "reqOb" object.
+						See "reqOb" class and its constructor for more information.
+						*/
 						reqOb curReq = new reqOb(request,userStr,remoteAd,out,data);
-						msgQ.put(curReq);				
+						
+						//put the object(and its data) inside the BlockingQueue
+						msgQ.put(curReq);
+						
+						//t2.start();
+						
 					}
 					catch(InterruptedException e){
 						StringWriter sw = new StringWriter();
@@ -130,6 +160,12 @@ else if(inputLine.startsWith("Accept")){
 					//Response sent to client, time to close streams/sockets and wait for another request.
 					request="";
 					userStr="";
+					
+					//out.close();
+					//data.close();
+					//in.close();
+					//clientSocket.close();
+					//System.out.println("here");
 				}
 			}
 			catch(Exception E){ //in case something bad happens

Test1.class

@@ -0,0 +1,63 @@
+
+Classes explanation:
+
+	mainServer			: our main thread for the server
+	clientThread 		: worker thread that takes the required data and sends the response
+	statThread 			: statistics thread
+	xmlParser			: XML Parser for the configuration
+	reqOb				: constructs an object with the required data for the clientThread
+	
+Program explanation:
+	mainServer runs a Web-Server continously in its main thread.
+	It can support 2 threads-workers(clientThread class) which handle the response on port 8000.
+	Also, on another thread, we have port 8001 that shows the Statistics about the server.
+	
+	About XML Parsing:
+		The Server is configured to run at /root/ directory.
+		(In Windows, it's C:/root/ ) 
+		
+		"config.xml" file is in a different format than the example that you provide us.
+		(As said in the lecture, we could make our own XML file from the beginning)
+		You do not have to place the configuration file as an argument when running the program.
+		You just need to have it under the same directory with the executable.
+		If you want to change a directory or a port for the server to use, just edit the config.xml.
+		It's in a simpler format for the XML DOM Parser libraries to use, without node-kids searching.
+		If you want it in an alternative form, contact us.
+	
+	About the logs:
+		access_log.txt and error_log.txt are created under /root/.
+	
+	About concurrency-threads :
+		Our program can support 2 workers that send responses.
+		We use a BlockingQueue where we load there the required data for the request.
+		The workers take the objects from the queue and work for them sending the response.
+		This is a technique to solve concurrency problems since when a worker tries to take an object
+		from the BlockingQueue and it's null, the worker blocks until an object gets put into the queue for 
+		him to work!
+		Also, we added "synchronized" prefix on some methods in clientThread (worker class) so only one
+		thread runs the method at the time and doesn't interrupt the other.
+		Just like the 'locks' example we saw in the lectures.
+		
+		Last but not least, uncomment line 99-100 in mainServer to test the second worker.
+
+Problems/Caution! :
+		1)According to your computer and your browser, you might see some problems in concurrency as the program might try to send 
+		data to a closed(by false) socket.
+		This corresponds to line 356 in clientThread class.
+		This error can occur when the local network system aborts a connection, 
+		such as when WinSock closes an established connection after data retransmission fails 
+		(receiver never acknowledges data sent on a datastream socket)
+	
+		2)Given "mime-types.txt" had a double entry for .mp4 , which blocked our browsers from playing the video.
+		We deleted the one entry, so please use our mime-types.txt file for testing.
+		
+		3)As said previously, there is no need to put the .xml config file as an argument anymore.
+		We do this automatically!
+		
+Contact:
+		Eleftherios Panagiotis Loukas : eloukas@uth.gr
+		Katerina Kanellopoulou 		  : akanellop@uth.gr
+		
+	
+	
+	

Test1.java

@@ -1,8 +1,11 @@
+//package ce325.hw2;
 import java.io.*;
 import java.util.*;
 import java.lang.*;
 import java.text.*;
 
+
+
 public class reqOb{
 	public String request; 
 	public String userStr;

clientThread.class

@@ -1,11 +1,15 @@
+//package ce325.hw2;
+
 import java.net.*;
 import java.io.*;
 import java.util.*;
 import java.lang.*;
 import java.text.*;
 import java.nio.file.Files;
 
-
+/*
+statThread : class that gives us statistics about the server in 8001 port 
+*/
 public class statThread extends Thread{
 
 	public void run(){
@@ -18,6 +22,7 @@ public void run(){
 	public static void openSocket() throws IOException, BindException{
 		String inputLine="";
 		ServerSocket statSocket = new ServerSocket(mainServer.statPortNumber); 
+		
 		while(true){
 			try{
 				Socket statClient = statSocket.accept();
@@ -43,13 +48,21 @@ public static void openSocket() throws IOException, BindException{
 			}
 		}
 	}
-		/*builds and sends the html page and the http response for the statisstics requests*/
+	
+	/*
+	statHTML method 
+		takes PrintWriter out as an argument so it can send an HTTP RESPONSE and then
+		builds and sends the html page and the http response for the statisstics requests
+	*/
 	public static void statHTML(PrintWriter out)throws Exception{
+		
 		//Create a StringBuilder object, called "html", in which we build the html(you don't say!)
 		StringBuilder html = new StringBuilder();
-		//Start of HTML
+		
+		//Start of HTMLbuilding
 		html.append( "<html>\r\n" );
 		html.append( "<head>\r\n" );
+		
 		//Title 
 		html.append( "<title>Statistics For Server</title>\r\n" );
 		html.append( "</head>\r\n" );
@@ -62,9 +75,10 @@ public static void statHTML(PrintWriter out)throws Exception{
 		}
 		html.append( "<h4>Total number of connections : "+mainServer.countCons+"</h4>\r\n" );
 		html.append( "<h4>Total number of errors : "+mainServer.countErrors+"</h4>\r\n" );
-		//End of HTML
+		//End of HTML building
 		html.append( "</body>\r\n" );
 		html.append( "</html>\r\n" );
+		
 		//Send HTTP RESPONSE
 		Date date = new Date();
 		out.print("HTTP/1.1 200 OK" + "\r\n");
@@ -73,10 +87,11 @@ public static void statHTML(PrintWriter out)throws Exception{
 		out.print( "Content-length: " + html.toString().length() + "\r\n" );
 		out.print( "Connection: close\r\n" );
 		out.print( "Content-type: text/html\r\n\r\n" );
+		
 		//SEND HTML RESPONSE
 		out.print( html.toString() );
 		//flush
-		 out.flush();
+		out.flush();
 	}
 
 }

clientThread.java

@@ -1,3 +1,5 @@
+//package ce325.hw2;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.StringTokenizer;
@@ -42,19 +44,16 @@ public static void buildDoc(){
 
 			//optional, but may be recommended --IS IT NEEDED????
 			doc.getDocumentElement().normalize();
-			//check
 
 			/*
 			//doc.getElementsByTagName("method") returns a NodeList.
 			//doc.getElementsByTagName("method").item(0) - returns a Node.
 			//doc.getElementsByTagName("method").item(0).getTextContent() returns the value 
 			*/
 
-			//System.out.println("before getting elements");
-			//port1 = doc.getElementsByTagName("listen port").item(0).getTextContent();
+			
 			port1 = doc.getElementsByTagName("listenport").item(0).getTextContent();
-			//System.out.println("got port1 " + port1);
-			//System.out.println("after listenport");
+			
 			port2 = doc.getElementsByTagName("statisticsport").item(0).getTextContent();
 			//System.out.println("got port2 " + port2);
 
@@ -66,17 +65,6 @@ public static void buildDoc(){
 			//System.out.println("got rootDirectory " + rootDirectory);
 
 
-			/*
-			System.out.println("\nbefore tokenizer\n");
-			System.out.println(port1);
-			*/
-			//why is this used???What do we split?
-			/*
-			StringTokenizer tokenizer = new StringTokenizer(port1, "\"");
-			while(tokenizer.hasMoreTokens()){
-				port1 = tokenizer.nextToken();
-			
-			*/
 			try{
 				//ports are returned as a string, so we type cast them to integers
 				listenPort = Integer.parseInt(port1);