From c056b083d2bfff3e11e44e50fa463e2f3107e59c Mon Sep 17 00:00:00 2001
From: Louis <louis.royer@univ-tlse3.fr>
Date: Thu, 12 Mar 2020 10:18:48 +0100
Subject: [PATCH] Fix jenkins

---
 Jenkinsfile             |   6 +-
 src/tools/HostItem.java | 130 +++++++++++++++++++++-------------------
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 644d8db..9e9770e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,10 +7,10 @@
             sh 'javac -cp "./src" -d "./bin" $(find . -iname "*.java" -type f) -Xlint:deprecation -encoding UTF8'
             sh 'echo "BUILDING CLIENT"'
             sh 'echo Main-Class: clientP2P/ClientP2P > MANIFEST.MF'
-            sh 'jar -cvmf MANIFEST.MF client.jar $(find . \\( -iname "*.class" -and ! -iwholename "*/serverP2P/*.class" \\) -type f)'
+            sh 'jar -cvmf MANIFEST.MF client.jar $(find bin/ -maxdepth 1 -mindepth 1 -printf "-C bin %f\n")'
             sh 'echo "BUILDING SERVER"'
-            sh 'echo Main-Class: javaProjet2020/Server > MANIFEST.MF'
-            sh 'jar -cvmf MANIFEST.MF server.jar $(find . \\( -iname "*.class" -and ! -iwholename "*/clientP2P/*.class" \\) -type f)'
+            sh 'echo Main-Class: serverP2P/ServerP2P > MANIFEST.MF'
+            sh 'jar -cvmf MANIFEST.MF server.jar $(find bin/ -maxdepth 1 -mindepth 1 -printf "-C bin %f\n")'
             sh 'tar -zcvf sources.tar.gz src/'
           }
         }
diff --git a/src/tools/HostItem.java b/src/tools/HostItem.java
index c0760c2..ffe2f58 100644
--- a/src/tools/HostItem.java
+++ b/src/tools/HostItem.java
@@ -7,78 +7,82 @@ import java.net.UnknownHostException;
 import java.io.IOException;
 
 /** Class to store hostnames + ports
-	 */
-	public class HostItem {
-		private String hostname;
-		private int port;
-		private Socket tcpSocket;
-		private DatagramSocket udpSocket;
+* @author	Louis Royer
+* @author	Flavien Haas
+* @author	JS Auge
+* @version	1.0
+*/
+public class HostItem {
+	private String hostname;
+	private int port;
+	private Socket tcpSocket;
+	private DatagramSocket udpSocket;
 
-		/** Constructor with hostname and port
-		 * @param hostname	Hostname
-		 * @param port	Port
-		 */
-		public HostItem(String hostname, int port) {
-			this.port = port;
-			this.hostname = hostname;
-		}
+	/** Constructor with hostname and port
+	 * @param hostname	Hostname
+	 * @param port	Port
+	 */
+	public HostItem(String hostname, int port) {
+		this.port = port;
+		this.hostname = hostname;
+	}
 
-		/** Get TCP Socket.
-		 * @return	TCP Socket
-		 */
-		public Socket getTCPSocket() {
-			if (tcpSocket == null) {
-				try {
-					tcpSocket = new Socket(InetAddress.getByName(hostname), port);
-				} catch (SocketException e) {
-					System.err.println("Error: No TCP socket available.");
-					System.exit(-1);
-				} catch (UnknownHostException e) {
-					System.err.println("Error: Unknown host.");
-					System.exit(-1);
-				} catch (IOException e) {
-					System.err.println("Error: Cannot create TCP socket");
-					System.exit(-1);
-				}
+	/** Get TCP Socket.
+	 * @return	TCP Socket
+	 */
+	public Socket getTCPSocket() {
+		if (tcpSocket == null) {
+			try {
+				tcpSocket = new Socket(InetAddress.getByName(hostname), port);
+			} catch (SocketException e) {
+				System.err.println("Error: No TCP socket available.");
+				System.exit(-1);
+			} catch (UnknownHostException e) {
+				System.err.println("Error: Unknown host.");
+				System.exit(-1);
+			} catch (IOException e) {
+				System.err.println("Error: Cannot create TCP socket");
+				System.exit(-1);
 			}
-			return tcpSocket;
 		}
+		return tcpSocket;
+	}
 
-		/** Closes tcp socket
-		 */
-		public void closeTCPSocket() {
-			if (tcpSocket != null) {
-				try {
-					tcpSocket.close();
-				} catch (IOException e2) {
-					System.err.println("Error: cannot close socket");
-				}
+	/** Closes tcp socket
+	 */
+	public void closeTCPSocket() {
+		if (tcpSocket != null) {
+			try {
+				tcpSocket.close();
+			} catch (IOException e2) {
+				System.err.println("Error: cannot close socket");
 			}
-			tcpSocket = null;
 		}
+		tcpSocket = null;
+	}
 
-		/** Get UDP Socket
-		 * return	UDP Socket
-		 */
-		public DatagramSocket getUDPSocket() {
-			if (udpSocket == null) {
-				try {
-					udpSocket = new DatagramSocket();
-					udpSocket.connect(InetAddress.getByName(hostname), port);
-				} catch (SocketException e) {
-					System.err.println("Error: No UDP socket available.");
-					System.exit(-1);
-				} catch (UnknownHostException e) {
-					System.err.println("Error: Unknown host.");
-					System.exit(-1);
-				}
+	/** Get UDP Socket
+	 * return	UDP Socket
+	 */
+	public DatagramSocket getUDPSocket() {
+		if (udpSocket == null) {
+			try {
+				udpSocket = new DatagramSocket();
+				udpSocket.connect(InetAddress.getByName(hostname), port);
+			} catch (SocketException e) {
+				System.err.println("Error: No UDP socket available.");
+				System.exit(-1);
+			} catch (UnknownHostException e) {
+				System.err.println("Error: Unknown host.");
+				System.exit(-1);
 			}
-			return udpSocket;
 		}
-		public void closeUDPSocket() {
-			if (udpSocket != null) {
-				udpSocket.close();
-			}
-			udpSocket = null;
+		return udpSocket;
+	}
+	public void closeUDPSocket() {
+		if (udpSocket != null) {
+			udpSocket.close();
 		}
+		udpSocket = null;
 	}
+}