Rached branch

.classpath

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -20,6 +15,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@@ -32,5 +28,22 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.factorypath

@@ -53,35 +53,10 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-webmvc/5.3.10/spring-webmvc-5.3.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-expression/5.3.10/spring-expression-5.3.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/mysql/mysql-connector-java/8.0.26/mysql-connector-java-8.0.26.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-starter-test/2.5.5/spring-boot-starter-test-2.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-test/2.5.5/spring-boot-test-2.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/boot/spring-boot-test-autoconfigure/2.5.5/spring-boot-test-autoconfigure-2.5.5.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/jayway/jsonpath/json-path/2.5.0/json-path-2.5.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/net/minidev/json-smart/2.4.7/json-smart-2.4.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/net/minidev/accessors-smart/2.4.7/accessors-smart-2.4.7.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/ow2/asm/asm/9.1/asm-9.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/assertj/assertj-core/3.19.0/assertj-core-3.19.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest/2.2/hamcrest-2.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/jupiter/junit-jupiter/5.7.2/junit-jupiter-5.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/jupiter/junit-jupiter-api/5.7.2/junit-jupiter-api-5.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/platform/junit-platform-commons/1.7.2/junit-platform-commons-1.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/jupiter/junit-jupiter-params/5.7.2/junit-jupiter-params-5.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/jupiter/junit-jupiter-engine/5.7.2/junit-jupiter-engine-5.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/junit/platform/junit-platform-engine/1.7.2/junit-platform-engine-1.7.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/mockito/mockito-core/3.9.0/mockito-core-3.9.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/net/bytebuddy/byte-buddy-agent/1.10.22/byte-buddy-agent-1.10.22.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/objenesis/objenesis/3.2/objenesis-3.2.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/mockito/mockito-junit-jupiter/3.9.0/mockito-junit-jupiter-3.9.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/skyscreamer/jsonassert/1.5.0/jsonassert-1.5.0.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/com/vaadin/external/google/android-json/0.0.20131108.vaadin1/android-json-0.0.20131108.vaadin1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-core/5.3.10/spring-core-5.3.10.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-jcl/5.3.10/spring-jcl-5.3.10.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/springframework/spring-test/5.3.10/spring-test-5.3.10.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/xmlunit/xmlunit-core/2.8.2/xmlunit-core-2.8.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/myfaces/core/myfaces-impl/2.2.12/myfaces-impl-2.2.12.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/commons-beanutils/commons-beanutils/1.9.2/commons-beanutils-1.9.2.jar" enabled="true" runInBatchMode="false"/>
@@ -97,9 +72,6 @@
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ocpsoft/rewrite/rewrite-servlet/3.4.1.Final/rewrite-servlet-3.4.1.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/ocpsoft/rewrite/rewrite-integration-faces/3.4.1.Final/rewrite-integration-faces-3.4.1.Final.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.22/lombok-1.18.22.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/junit/junit/4.12/junit-4.12.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="VARJAR" id="M2_REPO/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-core/2.14.1/log4j-core-2.14.1.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.14.1/log4j-api-2.14.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
 </factorypath>

.project

@@ -25,16 +25,24 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -1,5 +1,4 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,11 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.processAnnotations=enabled

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+  <fixed facet="wst.jsdt.web"/>
   <installed facet="cloudfoundry.standalone.app" version="1.0"/>
+  <installed facet="java" version="1.8"/>
+  <installed facet="jst.web" version="4.0"/>
+  <installed facet="wst.jsdt.web" version="1.0"/>
 </faceted-project>

Dockerfile

@@ -3,4 +3,4 @@ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \JAVA_OPTS=""
 WORKDIR /app
 ADD target/*.jar timesheet_devops.jar
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "/app/timesheet_devops.jar"] 
+ENTRYPOINT ["java", "-jar", "/app/timesheet_devops.jar"]

Jenkinsfile

@@ -1,6 +1,7 @@
 pipeline{
+
 	environment{
-		registry = '193jmt5213/timesheet_devops'
+		registry = 'rachedchakchouk/timesheet_img'
 		registryCredential= 'dockerHub'
 		dockerImage = ''
 	}
@@ -10,8 +11,8 @@ pipeline{
 		stage ('Checkout GIT'){
 			steps{
 				echo 'Pulling...';
-					git branch: 'Tarek_Branch',
-					url : 'https://github.com/TarekMESSAOUDI/Timesheet_DevOps';
+					git branch: 'Rached_Branch',
+					url : 'https://github.com/rachedchakchouk/Timesheet_DevOps';
 			}
 		}
 
@@ -78,11 +79,8 @@ pipeline{
 }
 
 	post{
-		success{
-			emailext body: 'Build success', subject: 'Jenkins', to:'tarek.messaoudi@esprit.tn'
-		}
-		failure{
-			emailext body: 'Build failure', subject: 'Jenkins', to:'tarek.messaoudi@esprit.tn'
-		}
+	always{
+		emailext body: 'Build # $BUILD_NUMBER - $BUILD_STATUS!', subject: 'mail of pipeline satut', to: 'rached.chakchouk@esprit.tn'
+	}
 	}
 }

pom.xml

@@ -16,7 +16,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 	</properties>
-	<dependencies>
+		<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -35,7 +35,13 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+
+
+
+
 		<!-- dependicies jsf -->
+
 		<dependency>
 			<groupId>org.apache.myfaces.core</groupId>
 			<artifactId>myfaces-impl</artifactId>
@@ -65,29 +71,41 @@
 			<artifactId>primefaces</artifactId>
 			<version>6.1</version>
 		</dependency>-->
+
+
 		<dependency>
+
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.22</version>
             <scope>provided</scope>
-    	</dependency>
+
+
+    </dependency>
+
+
+
 		<dependency>
+
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version><!--$NO-MVN-MAN-VER$-->
 			<scope>test</scope>
 		</dependency>
+
+
+
 		<dependency>
     		<groupId>org.apache.logging.log4j</groupId>
     		<artifactId>log4j-core</artifactId>
     		<version>2.14.1</version>
 		</dependency>
+
 	</dependencies>
 
 	<build>
 		<plugins>
-
-			<plugin>
+		<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>

src/main/java/tn/esprit/spring/entity/Projet.java

@@ -19,9 +19,9 @@ public class Projet implements Serializable {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private int id;
 
-	private String name_project;
+	private String nameproject;
 
-	private String description_project;
+	private String descriptionproject;
 
 	@ManyToOne
 	private Departement departement;
@@ -37,20 +37,20 @@ public void setId(int id) {
 		this.id = id;
 	}
 
-	public String getName_project() {
-		return name_project;
+	public String getNameproject() {
+		return nameproject;
 	}
 
-	public void setName_project(String name_project) {
-		this.name_project = name_project;
+	public void setNameproject(String nameproject) {
+		this.nameproject = nameproject;
 	}
 
-	public String getDescription_project() {
-		return description_project;
+	public String getDescriptionproject() {
+		return descriptionproject;
 	}
 
-	public void setDescription_project(String description_project) {
-		this.description_project = description_project;
+	public void setDescriptionproject(String descriptionproject) {
+		this.descriptionproject = descriptionproject;
 	}
 
 	public Departement getDepartement() {
@@ -71,7 +71,7 @@ public void setEmployes(List<Employe> employes) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(departement, description_project, employes, id, name_project);
+		return Objects.hash(departement, descriptionproject, employes, id, nameproject);
 	}
 
 	@Override
@@ -84,34 +84,27 @@ public boolean equals(Object obj) {
 			return false;
 		Projet other = (Projet) obj;
 		return Objects.equals(departement, other.departement)
-				&& Objects.equals(description_project, other.description_project)
+				&& Objects.equals(descriptionproject, other.descriptionproject)
 				&& Objects.equals(employes, other.employes) && id == other.id
-				&& Objects.equals(name_project, other.name_project);
+				&& Objects.equals(nameproject, other.nameproject);
 	}
 
 	@Override
 	public String toString() {
-		return "Projet [id=" + id + ", name_project=" + name_project + ", description_project=" + description_project
+		return "Projet [id=" + id + ", nameproject=" + nameproject + ", descriptionproject=" + descriptionproject
 				+ ", departement=" + departement + ", employes=" + employes + "]";
 	}
 
-	public Projet(String name_project, String description_project, Departement departement, List<Employe> employes) {
+	public Projet(String nameproject, String descriptionproject) {
 		super();
-		this.name_project = name_project;
-		this.description_project = description_project;
-		this.departement = departement;
-		this.employes = employes;
-	}
-
-	public Projet(String name_project, String description_project) {
-		super();
-		this.name_project = name_project;
-		this.description_project = description_project;
+		this.nameproject = nameproject;
+		this.descriptionproject = descriptionproject;
 	}
 
 	public Projet() {
 		super();
 
 	}
 
+
 }

src/main/java/tn/esprit/spring/repository/IProjetRepository.java

@@ -1,9 +1,12 @@
 package tn.esprit.spring.repository;
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import tn.esprit.spring.entity.Projet;
 
+
+@Repository
 public interface IProjetRepository extends CrudRepository<Projet, Integer> {
 
 }

src/main/java/tn/esprit/spring/service/IProjetService.java

@@ -1,24 +1,14 @@
 package tn.esprit.spring.service;
 
-import java.util.List;
 
 
-import tn.esprit.spring.entity.Departement;
+
+
 import tn.esprit.spring.entity.Projet;
 
 public interface IProjetService {
 	public int ajouterProjet(Projet projet);
 
-	/*
-	 * public int ajouterDepartement(Departement departement); void
-	 * affecterEmployeAProjet(int empId, int projId); void
-	 * affecterProjetADepartement(int projId,int depId); List<String>
-	 * getAllEmployeNameByProject(int projId); List<String>
-	 * getAllProjectNameByDepartement(int depId);
-	 */
 	public void deleteProjectById(int projId);
-	/*
-	 * public void deleteDepartementById(int depId); public Projet getProjetById(int
-	 * projId);
-	 */
+
 }