diff --git a/.gradle/7.4.1/checksums/checksums.lock b/.gradle/7.4.1/checksums/checksums.lock index e7a5cfa4006deb7dd725590693998017ccd3e95b..61e1e2327a6cd02c5b6609cfbdbde00af3457cd1 100644 Binary files a/.gradle/7.4.1/checksums/checksums.lock and b/.gradle/7.4.1/checksums/checksums.lock differ diff --git a/.gradle/7.4.1/checksums/md5-checksums.bin b/.gradle/7.4.1/checksums/md5-checksums.bin index 4dcf4daafecb5dfaab762cd2c89ac1c3072908ae..d75b6cfb0059368cdd16f60a0fb1ed9286231763 100644 Binary files a/.gradle/7.4.1/checksums/md5-checksums.bin and b/.gradle/7.4.1/checksums/md5-checksums.bin differ diff --git a/.gradle/7.4.1/checksums/sha1-checksums.bin b/.gradle/7.4.1/checksums/sha1-checksums.bin index 6c97b451629d0cba4e96cb98b270404d015bb95e..1d6f413fa00b9d31465ae7e78fd5b12ff6f24ebb 100644 Binary files a/.gradle/7.4.1/checksums/sha1-checksums.bin and b/.gradle/7.4.1/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock index bb87dff84e19540605f8f6f78f8d7b548a259592..f7c0fffd6ea311c0ca24df3f724f68c3dcfe3d2e 100644 Binary files a/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock and b/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/7.4.1/executionHistory/executionHistory.bin b/.gradle/7.4.1/executionHistory/executionHistory.bin index 27bd44615a449b1147f107478767737d823d659c..1ca13825097c01790d11e0f2fbaeecfd1155346b 100644 Binary files a/.gradle/7.4.1/executionHistory/executionHistory.bin and b/.gradle/7.4.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.4.1/executionHistory/executionHistory.lock b/.gradle/7.4.1/executionHistory/executionHistory.lock index 3a0ec28d2eb2d0cb6edf236bb88dfe794c954f01..90a5dc99e50d2a89d93865ca638ebdc10e988afc 100644 Binary files a/.gradle/7.4.1/executionHistory/executionHistory.lock and b/.gradle/7.4.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.4.1/fileHashes/fileHashes.bin b/.gradle/7.4.1/fileHashes/fileHashes.bin index 104c4b0746d7045f758312fe0e707a013b779ba1..fa7f191cc18984b9ac007ef916657da117baedf3 100644 Binary files a/.gradle/7.4.1/fileHashes/fileHashes.bin and b/.gradle/7.4.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.4.1/fileHashes/fileHashes.lock b/.gradle/7.4.1/fileHashes/fileHashes.lock index e81593b672268ba07bc94af02ba60e8be34c3e2b..fa22f48bc2f40ed412efebc098b4d2590012612a 100644 Binary files a/.gradle/7.4.1/fileHashes/fileHashes.lock and b/.gradle/7.4.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin index 002351d3cf1657907b96d9f6541b1a2c9c460936..0e4cf9c1dc2a3735cde1a1d34b90a662a81f5e38 100644 Binary files a/.gradle/7.4.1/fileHashes/resourceHashesCache.bin and b/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 119bb3081a29754d28b09ca4c2f8d3ccae6be0f5..a4d3587da0de234be35019e85739f312e5b39cde 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 322a6dbc33b255c9e6f79dd9dc18efed2fd7edd8..c4634a71b2c4392cde86ff80ec178c23abb754e6 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 72f263b8e9197bf25d0bd9830a6262de8dd7fd1f..f28f8e55beff7880184b292a89e526fc5c60e982 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/bin/default/.classpath b/bin/default/.classpath new file mode 100644 index 0000000000000000000000000000000000000000..a3623461c625aa259f6ddc7db9b7b17a057f5865 --- /dev/null +++ b/bin/default/.classpath @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry kind="output" path="bin/default"/> +</classpath> diff --git a/bin/default/.gradle/7.4.1/checksums/checksums.lock b/bin/default/.gradle/7.4.1/checksums/checksums.lock new file mode 100644 index 0000000000000000000000000000000000000000..f0ed0076b5d6f718f7d50f2d63732c9eb6af926a Binary files /dev/null and b/bin/default/.gradle/7.4.1/checksums/checksums.lock differ diff --git a/bin/default/.gradle/7.4.1/checksums/md5-checksums.bin b/bin/default/.gradle/7.4.1/checksums/md5-checksums.bin new file mode 100644 index 0000000000000000000000000000000000000000..d75b6cfb0059368cdd16f60a0fb1ed9286231763 Binary files /dev/null and b/bin/default/.gradle/7.4.1/checksums/md5-checksums.bin differ diff --git a/bin/default/.gradle/7.4.1/checksums/sha1-checksums.bin b/bin/default/.gradle/7.4.1/checksums/sha1-checksums.bin new file mode 100644 index 0000000000000000000000000000000000000000..1d6f413fa00b9d31465ae7e78fd5b12ff6f24ebb Binary files /dev/null and b/bin/default/.gradle/7.4.1/checksums/sha1-checksums.bin differ diff --git a/bin/default/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock b/bin/default/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000000000000000000000000000000000000..bb87dff84e19540605f8f6f78f8d7b548a259592 Binary files /dev/null and b/bin/default/.gradle/7.4.1/dependencies-accessors/dependencies-accessors.lock differ diff --git a/bin/default/.gradle/7.4.1/dependencies-accessors/gc.properties b/bin/default/.gradle/7.4.1/dependencies-accessors/gc.properties new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..27bd44615a449b1147f107478767737d823d659c Binary files /dev/null and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.bin differ diff --git a/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..3a0ec28d2eb2d0cb6edf236bb88dfe794c954f01 Binary files /dev/null and b/bin/default/.gradle/7.4.1/executionHistory/executionHistory.lock differ diff --git a/bin/default/.gradle/7.4.1/fileChanges/last-build.bin b/bin/default/.gradle/7.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d Binary files /dev/null and b/bin/default/.gradle/7.4.1/fileChanges/last-build.bin differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..104c4b0746d7045f758312fe0e707a013b779ba1 Binary files /dev/null and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.bin differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..e81593b672268ba07bc94af02ba60e8be34c3e2b Binary files /dev/null and b/bin/default/.gradle/7.4.1/fileHashes/fileHashes.lock differ diff --git a/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000000000000000000000000000000000000..002351d3cf1657907b96d9f6541b1a2c9c460936 Binary files /dev/null and b/bin/default/.gradle/7.4.1/fileHashes/resourceHashesCache.bin differ diff --git a/bin/default/.gradle/7.4.1/gc.properties b/bin/default/.gradle/7.4.1/gc.properties new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..119bb3081a29754d28b09ca4c2f8d3ccae6be0f5 Binary files /dev/null and b/bin/default/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/bin/default/.gradle/buildOutputCleanup/cache.properties b/bin/default/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000000000000000000000000000000000000..3ae1033db236e953b5b497e1f7463fa4d4fe6b7b --- /dev/null +++ b/bin/default/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Apr 06 09:39:27 CEST 2022 +gradle.version=7.4.1 diff --git a/bin/default/.gradle/buildOutputCleanup/outputFiles.bin b/bin/default/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000000000000000000000000000000000000..322a6dbc33b255c9e6f79dd9dc18efed2fd7edd8 Binary files /dev/null and b/bin/default/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/bin/default/.gradle/file-system.probe b/bin/default/.gradle/file-system.probe new file mode 100644 index 0000000000000000000000000000000000000000..72f263b8e9197bf25d0bd9830a6262de8dd7fd1f Binary files /dev/null and b/bin/default/.gradle/file-system.probe differ diff --git a/bin/default/.gradle/vcs-1/gc.properties b/bin/default/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/default/.idea/.gitignore b/bin/default/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/bin/default/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/bin/default/.idea/compiler.xml b/bin/default/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..b589d56e9f285d8cfdc6c270853a5d439021a278 --- /dev/null +++ b/bin/default/.idea/compiler.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="CompilerConfiguration"> + <bytecodeTargetLevel target="17" /> + </component> +</project> \ No newline at end of file diff --git a/bin/default/.idea/gradle.xml b/bin/default/.idea/gradle.xml new file mode 100644 index 0000000000000000000000000000000000000000..611e7c8ad7b91e576987485e8678b0fdad4193ae --- /dev/null +++ b/bin/default/.idea/gradle.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="GradleMigrationSettings" migrationVersion="1" /> + <component name="GradleSettings"> + <option name="linkedExternalProjectsSettings"> + <GradleProjectSettings> + <option name="distributionType" value="DEFAULT_WRAPPED" /> + <option name="externalProjectPath" value="$PROJECT_DIR$" /> + <option name="modules"> + <set> + <option value="$PROJECT_DIR$" /> + </set> + </option> + </GradleProjectSettings> + </option> + </component> +</project> \ No newline at end of file diff --git a/bin/default/.idea/jarRepositories.xml b/bin/default/.idea/jarRepositories.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdc392fe877c32ab51d532fa67f65ff2e75e9061 --- /dev/null +++ b/bin/default/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="RemoteRepositoriesConfiguration"> + <remote-repository> + <option name="id" value="central" /> + <option name="name" value="Maven Central repository" /> + <option name="url" value="https://repo1.maven.org/maven2" /> + </remote-repository> + <remote-repository> + <option name="id" value="jboss.community" /> + <option name="name" value="JBoss Community repository" /> + <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> + </remote-repository> + <remote-repository> + <option name="id" value="MavenRepo" /> + <option name="name" value="MavenRepo" /> + <option name="url" value="https://repo.maven.apache.org/maven2/" /> + </remote-repository> + </component> +</project> \ No newline at end of file diff --git a/bin/default/.idea/misc.xml b/bin/default/.idea/misc.xml new file mode 100644 index 0000000000000000000000000000000000000000..49504efe3418dd3941f2fe28e1d2a070c7367046 --- /dev/null +++ b/bin/default/.idea/misc.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK" /> +</project> \ No newline at end of file diff --git a/bin/default/.idea/vcs.xml b/bin/default/.idea/vcs.xml new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/bin/default/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/bin/default/.project b/bin/default/.project new file mode 100644 index 0000000000000000000000000000000000000000..9e6fb8a0b7d85218e09e2b5912e6c4d2fac96ce1 --- /dev/null +++ b/bin/default/.project @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>applicationgommette</name> + <comment>Project applicationgommette created by Buildship.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.buildship.core.gradleprojectbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.buildship.core.gradleprojectnature</nature> + </natures> + <filteredResources> + <filter> + <id>1650109125761</id> + <name></name> + <type>30</type> + <matcher> + <id>org.eclipse.core.resources.regexFilterMatcher</id> + <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments> + </matcher> + </filter> + </filteredResources> +</projectDescription> diff --git a/bin/default/.settings/org.eclipse.buildship.core.prefs b/bin/default/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000000000000000000000000000000000..2b6d83b978b655950b6cae864a84b6f4b5b8b9cd --- /dev/null +++ b/bin/default/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home=/usr/lib/jvm/java-11-openjdk-amd64 +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/bin/default/README.md b/bin/default/README.md new file mode 100644 index 0000000000000000000000000000000000000000..518b469f0a34b04e9985b357190e7836a9245c09 --- /dev/null +++ b/bin/default/README.md @@ -0,0 +1,5 @@ +# TP Web-Serveur + +Vous pouvez démarrer avec la commande `./gradlew run`. + ++ d'infos sur https://unicorn.artheriom.fr/ diff --git a/bin/default/build.gradle b/bin/default/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..07af4997f2796bd8772957b7edf1c76722f7eebf --- /dev/null +++ b/bin/default/build.gradle @@ -0,0 +1,34 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +apply plugin: 'java' +apply plugin: 'application' + +mainClassName='com.uca.StartServer' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.freemarker:freemarker:2.3.30' + implementation 'com.sparkjava:spark-core:2.9.3' + implementation 'com.h2database:h2:1.4.200' + implementation 'io.jsonwebtoken:jjwt-api:0.11.2' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.2', 'io.jsonwebtoken:jjwt-jackson:0.11.2' + implementation 'org.mindrot:jbcrypt:0.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1' +} +test { + useJUnitPlatform() +} + +jar { + manifest { + attributes 'Implementation-Title': 'Gradle Quickstart', + 'Implementation-Version': '1.0.0', + 'Main-Class': 'com.uca.StartServer' + } +} + +sourceSets.main.java.srcDirs = ['src'] +sourceSets.test.java.srcDirs = ['src'] diff --git a/bin/default/build/resources/main/static/style.css b/bin/default/build/resources/main/static/style.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/default/build/resources/main/views/eleves.ftl b/bin/default/build/resources/main/views/eleves.ftl new file mode 100644 index 0000000000000000000000000000000000000000..e3f8abcdc31a67d88ed50303b66b0f84e37bb3fa --- /dev/null +++ b/bin/default/build/resources/main/views/eleves.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des élèves: </h1> + <#list eleves as eleve> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${prof.dateNaissance}) </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/build/resources/main/views/gommetteAttribs.ftl b/bin/default/build/resources/main/views/gommetteAttribs.ftl new file mode 100644 index 0000000000000000000000000000000000000000..74ed4d218fcfd091250c6b8c935c02c634c95c20 --- /dev/null +++ b/bin/default/build/resources/main/views/gommetteAttribs.ftl @@ -0,0 +1,13 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <#list gommetteAttribs as gommetteAttrib> + <li>${gommetteAttrib.id} - eleve:${gommetteAttrib.idEleve}, prof:${gommetteAttrib.idProf}, raison:${gommetteAttrib.raison} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/build/resources/main/views/gommettes.ftl b/bin/default/build/resources/main/views/gommettes.ftl new file mode 100644 index 0000000000000000000000000000000000000000..07c3774adb64fb7b9d78c1f4ad449b21664bcbfd --- /dev/null +++ b/bin/default/build/resources/main/views/gommettes.ftl @@ -0,0 +1,13 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <#list gommettes as gommette> + <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/build/resources/main/views/profs.ftl b/bin/default/build/resources/main/views/profs.ftl new file mode 100644 index 0000000000000000000000000000000000000000..106a4ef08b10295ad5a5e8c38d27c415ca0dfe94 --- /dev/null +++ b/bin/default/build/resources/main/views/profs.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des enseignants: </h1> + <#list profs as prof> + <li>${prof.id} - ${prof.firstName} ${prof.lastName} aka ${prof.userName} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/build/resources/main/views/users.ftl b/bin/default/build/resources/main/views/users.ftl new file mode 100644 index 0000000000000000000000000000000000000000..0a474b755ed537f9fad68b23c97e5b9884f4301e --- /dev/null +++ b/bin/default/build/resources/main/views/users.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des utilisateurs: </h1> + <#list users as user> + <li>${user.id} - ${user.firstName} ${user.lastName} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/build/tmp/compileJava/previous-compilation-data.bin b/bin/default/build/tmp/compileJava/previous-compilation-data.bin new file mode 100644 index 0000000000000000000000000000000000000000..696af7713ba6696ab5d66308658b2e9599f92e85 Binary files /dev/null and b/bin/default/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/bin/default/gradle/wrapper/gradle-wrapper.jar b/bin/default/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f6b961fd5a86aa5fbfe90f707c3138408be7c718 Binary files /dev/null and b/bin/default/gradle/wrapper/gradle-wrapper.jar differ diff --git a/bin/default/gradle/wrapper/gradle-wrapper.properties b/bin/default/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000000000000000000000000000000000..c620efca2d0590e1cffd06c9e7e06fb551131f81 --- /dev/null +++ b/bin/default/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Feb 13 14:20:59 CET 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip diff --git a/bin/default/gradlew b/bin/default/gradlew new file mode 100755 index 0000000000000000000000000000000000000000..cccdd3d517fc5249beaefa600691cf150f2fa3e6 --- /dev/null +++ b/bin/default/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/bin/default/gradlew.bat b/bin/default/gradlew.bat new file mode 100755 index 0000000000000000000000000000000000000000..e95643d6a2ca62258464e83c72f5156dc941c609 --- /dev/null +++ b/bin/default/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/bin/default/help-table.md b/bin/default/help-table.md new file mode 100644 index 0000000000000000000000000000000000000000..43308b2aa6f91f4857df36e170e8ee5533ae00fc --- /dev/null +++ b/bin/default/help-table.md @@ -0,0 +1,13 @@ +Tables : + + +-users (id, firstName, lastName) + +-profs (id, firstName, lastName, userName) + +-eleves (id, firstName, lastName, nomClasse, dateNaissance) + +-gommettes (id, nom, description) + +-gommetteAttribs (id, idEleve, idProf, raison) + diff --git a/bin/default/help-thomas.txt b/bin/default/help-thomas.txt new file mode 100644 index 0000000000000000000000000000000000000000..7cb03ec04cfd97fe96a1afd9409ee68e39f5d20d --- /dev/null +++ b/bin/default/help-thomas.txt @@ -0,0 +1 @@ +.\gradlew run \ No newline at end of file diff --git a/bin/default/src/com/uca/StartServer.class b/bin/default/src/com/uca/StartServer.class new file mode 100644 index 0000000000000000000000000000000000000000..0348c6e15f888babaefc30d71852b8f0cdfb3baf Binary files /dev/null and b/bin/default/src/com/uca/StartServer.class differ diff --git a/bin/default/src/com/uca/core/Core.class b/bin/default/src/com/uca/core/Core.class new file mode 100644 index 0000000000000000000000000000000000000000..5c10137a322856cabdc2f7ad0383ffae5404c8cb Binary files /dev/null and b/bin/default/src/com/uca/core/Core.class differ diff --git a/bin/default/src/com/uca/core/EleveCore.class b/bin/default/src/com/uca/core/EleveCore.class new file mode 100644 index 0000000000000000000000000000000000000000..83766c785cd3535c83e10ef8ae95eaa097aa5bb0 Binary files /dev/null and b/bin/default/src/com/uca/core/EleveCore.class differ diff --git a/bin/default/src/com/uca/core/GommetteAttribCore.class b/bin/default/src/com/uca/core/GommetteAttribCore.class new file mode 100644 index 0000000000000000000000000000000000000000..fa4a49ac83f1126e6e6acaf369b5d155ddd4f7ef Binary files /dev/null and b/bin/default/src/com/uca/core/GommetteAttribCore.class differ diff --git a/bin/default/src/com/uca/core/GommetteCore.class b/bin/default/src/com/uca/core/GommetteCore.class new file mode 100644 index 0000000000000000000000000000000000000000..cbdcfdac0ed87af26ef581abe0fdf55a019246d4 Binary files /dev/null and b/bin/default/src/com/uca/core/GommetteCore.class differ diff --git a/bin/default/src/com/uca/core/ProfCore.class b/bin/default/src/com/uca/core/ProfCore.class new file mode 100644 index 0000000000000000000000000000000000000000..b62e424c8c912af31675fe45ea783bd3042a423a Binary files /dev/null and b/bin/default/src/com/uca/core/ProfCore.class differ diff --git a/bin/default/src/com/uca/core/UserCore.class b/bin/default/src/com/uca/core/UserCore.class new file mode 100644 index 0000000000000000000000000000000000000000..58c42803a7747c466647fad50e2aa66a84ef6f4a Binary files /dev/null and b/bin/default/src/com/uca/core/UserCore.class differ diff --git a/bin/default/src/com/uca/core/_DefaultCore.class b/bin/default/src/com/uca/core/_DefaultCore.class new file mode 100644 index 0000000000000000000000000000000000000000..e1afec6ee42bae507d12eb66a7cdfcce4067909f Binary files /dev/null and b/bin/default/src/com/uca/core/_DefaultCore.class differ diff --git a/bin/default/src/com/uca/dao/EleveDAO.class b/bin/default/src/com/uca/dao/EleveDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..dcf3369a90882006136c6b3c98bf2866154fd21f Binary files /dev/null and b/bin/default/src/com/uca/dao/EleveDAO.class differ diff --git a/bin/default/src/com/uca/dao/GommetteAttribDAO.class b/bin/default/src/com/uca/dao/GommetteAttribDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..7f447b8ded71890a731a62ab06c4c2cbbaecb6fb Binary files /dev/null and b/bin/default/src/com/uca/dao/GommetteAttribDAO.class differ diff --git a/bin/default/src/com/uca/dao/GommetteDAO.class b/bin/default/src/com/uca/dao/GommetteDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..31ab96b2134257c59dd96742c89b6ab3413ef024 Binary files /dev/null and b/bin/default/src/com/uca/dao/GommetteDAO.class differ diff --git a/bin/default/src/com/uca/dao/ProfDAO.class b/bin/default/src/com/uca/dao/ProfDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..ffebcc69ccc12ef7b068aa8f9df3e25fbe243932 Binary files /dev/null and b/bin/default/src/com/uca/dao/ProfDAO.class differ diff --git a/bin/default/src/com/uca/dao/UserDAO.class b/bin/default/src/com/uca/dao/UserDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..719ab56f7d9d4e6f6c7680f752789912b573e7f5 Binary files /dev/null and b/bin/default/src/com/uca/dao/UserDAO.class differ diff --git a/bin/default/src/com/uca/dao/_Connector.class b/bin/default/src/com/uca/dao/_Connector.class new file mode 100644 index 0000000000000000000000000000000000000000..6b3b8b16c6572b8cfdb9db53ef861e524448e171 Binary files /dev/null and b/bin/default/src/com/uca/dao/_Connector.class differ diff --git a/bin/default/src/com/uca/dao/_DefaultDAO.class b/bin/default/src/com/uca/dao/_DefaultDAO.class new file mode 100644 index 0000000000000000000000000000000000000000..8b687cda483d3099eb17cecca01f9f2c94b20c30 Binary files /dev/null and b/bin/default/src/com/uca/dao/_DefaultDAO.class differ diff --git a/bin/default/src/com/uca/dao/_Generic.class b/bin/default/src/com/uca/dao/_Generic.class new file mode 100644 index 0000000000000000000000000000000000000000..6a4b046910d5b105077ce36ac7f87c3914d99e7f Binary files /dev/null and b/bin/default/src/com/uca/dao/_Generic.class differ diff --git a/bin/default/src/com/uca/dao/_Initializer.class b/bin/default/src/com/uca/dao/_Initializer.class new file mode 100644 index 0000000000000000000000000000000000000000..0f8d5d6e860d6fbd3f640c5475b82ee6c66abc95 Binary files /dev/null and b/bin/default/src/com/uca/dao/_Initializer.class differ diff --git a/bin/default/src/com/uca/entity/Couleur.class b/bin/default/src/com/uca/entity/Couleur.class new file mode 100644 index 0000000000000000000000000000000000000000..a283b8d8f7a287deee7e39d893c25d250abdcf5c Binary files /dev/null and b/bin/default/src/com/uca/entity/Couleur.class differ diff --git a/bin/default/src/com/uca/entity/EleveEntity.class b/bin/default/src/com/uca/entity/EleveEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..b3a373499430679ad3295d98b6e51ed60631678b Binary files /dev/null and b/bin/default/src/com/uca/entity/EleveEntity.class differ diff --git a/bin/default/src/com/uca/entity/Entity.class b/bin/default/src/com/uca/entity/Entity.class new file mode 100644 index 0000000000000000000000000000000000000000..807fd92a51f7a674357b2654f123e1fda836ad42 Binary files /dev/null and b/bin/default/src/com/uca/entity/Entity.class differ diff --git a/bin/default/src/com/uca/entity/GommetteAttribEntity.class b/bin/default/src/com/uca/entity/GommetteAttribEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..b44a8ceef636af699dff8a56448f5855c1ac3ad0 Binary files /dev/null and b/bin/default/src/com/uca/entity/GommetteAttribEntity.class differ diff --git a/bin/default/src/com/uca/entity/GommetteEntity.class b/bin/default/src/com/uca/entity/GommetteEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..57fa5078bee584298b584662186b01e4a6dd92a4 Binary files /dev/null and b/bin/default/src/com/uca/entity/GommetteEntity.class differ diff --git a/bin/default/src/com/uca/entity/ProfEntity.class b/bin/default/src/com/uca/entity/ProfEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..24614c9f039378ff1b6aceaac6cb52d0fe8639f9 Binary files /dev/null and b/bin/default/src/com/uca/entity/ProfEntity.class differ diff --git a/bin/default/src/com/uca/entity/UserEntity.class b/bin/default/src/com/uca/entity/UserEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..70b5d8604b729950c3f10c9792f0906a01d026ec Binary files /dev/null and b/bin/default/src/com/uca/entity/UserEntity.class differ diff --git a/bin/default/src/com/uca/gui/DefaultGUI.class b/bin/default/src/com/uca/gui/DefaultGUI.class new file mode 100644 index 0000000000000000000000000000000000000000..89aa2a17b4a8697f3195cc1a796f9e81e3c12caf Binary files /dev/null and b/bin/default/src/com/uca/gui/DefaultGUI.class differ diff --git a/bin/default/src/com/uca/gui/ProfGUI.class b/bin/default/src/com/uca/gui/ProfGUI.class new file mode 100644 index 0000000000000000000000000000000000000000..ef74f504cf37afebeea6c04d632169fdb59bb35b Binary files /dev/null and b/bin/default/src/com/uca/gui/ProfGUI.class differ diff --git a/bin/default/src/com/uca/gui/UserGUI.class b/bin/default/src/com/uca/gui/UserGUI.class new file mode 100644 index 0000000000000000000000000000000000000000..09b021ef5e26f6b0879d6b2f6601271953d4ec92 Binary files /dev/null and b/bin/default/src/com/uca/gui/UserGUI.class differ diff --git a/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class b/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class new file mode 100644 index 0000000000000000000000000000000000000000..e9702bc833a1429af0724c994a5d73b27445f083 Binary files /dev/null and b/bin/default/src/com/uca/gui/_FreeMarkerInitializer.class differ diff --git a/bin/default/src/main/resources/static/style.css b/bin/default/src/main/resources/static/style.css new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/default/src/main/resources/views/eleves.ftl b/bin/default/src/main/resources/views/eleves.ftl new file mode 100644 index 0000000000000000000000000000000000000000..e3f8abcdc31a67d88ed50303b66b0f84e37bb3fa --- /dev/null +++ b/bin/default/src/main/resources/views/eleves.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des élèves: </h1> + <#list eleves as eleve> + <li>${eleve.id} - ${eleve.nomClasse} - ${eleve.firstName} ${eleve.lastName} (${prof.dateNaissance}) </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/src/main/resources/views/gommetteAttribs.ftl b/bin/default/src/main/resources/views/gommetteAttribs.ftl new file mode 100644 index 0000000000000000000000000000000000000000..74ed4d218fcfd091250c6b8c935c02c634c95c20 --- /dev/null +++ b/bin/default/src/main/resources/views/gommetteAttribs.ftl @@ -0,0 +1,13 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <#list gommetteAttribs as gommetteAttrib> + <li>${gommetteAttrib.id} - eleve:${gommetteAttrib.idEleve}, prof:${gommetteAttrib.idProf}, raison:${gommetteAttrib.raison} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/src/main/resources/views/gommettes.ftl b/bin/default/src/main/resources/views/gommettes.ftl new file mode 100644 index 0000000000000000000000000000000000000000..07c3774adb64fb7b9d78c1f4ad449b21664bcbfd --- /dev/null +++ b/bin/default/src/main/resources/views/gommettes.ftl @@ -0,0 +1,13 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <#list gommettes as gommette> + <li>${gommette.id} - ${gommette.nom} : ${gommette.description} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/src/main/resources/views/profs.ftl b/bin/default/src/main/resources/views/profs.ftl new file mode 100644 index 0000000000000000000000000000000000000000..106a4ef08b10295ad5a5e8c38d27c415ca0dfe94 --- /dev/null +++ b/bin/default/src/main/resources/views/profs.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des enseignants: </h1> + <#list profs as prof> + <li>${prof.id} - ${prof.firstName} ${prof.lastName} aka ${prof.userName} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/bin/default/src/main/resources/views/users.ftl b/bin/default/src/main/resources/views/users.ftl new file mode 100644 index 0000000000000000000000000000000000000000..0a474b755ed537f9fad68b23c97e5b9884f4301e --- /dev/null +++ b/bin/default/src/main/resources/views/users.ftl @@ -0,0 +1,14 @@ +<#ftl encoding="utf-8"> + +<body xmlns="http://www.w3.org/1999/html"> + +<ul> + <h1> Liste des utilisateurs: </h1> + <#list users as user> + <li>${user.id} - ${user.firstName} ${user.lastName} </li> + </#list> +</ul> + +</body> + +</html> diff --git a/build/classes/java/main/com/uca/StartServer.class b/build/classes/java/main/com/uca/StartServer.class index aa02a7396f7b9144c456bc8a30f368a116dcd299..971a70de7e04b8e96c4d7b778b7f02f856b55b51 100644 Binary files a/build/classes/java/main/com/uca/StartServer.class and b/build/classes/java/main/com/uca/StartServer.class differ diff --git a/build/classes/java/main/com/uca/core/Core.class b/build/classes/java/main/com/uca/core/Core.class index 6e34e696f0be920022ff5abfd960567d095a7711..649d29fab350d1cdefbfedbd5bf294e963f49c5c 100644 Binary files a/build/classes/java/main/com/uca/core/Core.class and b/build/classes/java/main/com/uca/core/Core.class differ diff --git a/build/classes/java/main/com/uca/core/EleveCore.class b/build/classes/java/main/com/uca/core/EleveCore.class index 5262dd1d9f2577487cbbf1de33a5b692a5e26cd0..896dd3ae313750c380ec7808bc387a2a679b1c72 100644 Binary files a/build/classes/java/main/com/uca/core/EleveCore.class and b/build/classes/java/main/com/uca/core/EleveCore.class differ diff --git a/build/classes/java/main/com/uca/core/GommetteAttribCore.class b/build/classes/java/main/com/uca/core/GommetteAttribCore.class index c4ea2adfc617c6e9c13acf1f37812a09cf0941fa..650f5eb54fd35615ffa9b4a31da503da8e585f00 100644 Binary files a/build/classes/java/main/com/uca/core/GommetteAttribCore.class and b/build/classes/java/main/com/uca/core/GommetteAttribCore.class differ diff --git a/build/classes/java/main/com/uca/core/GommetteCore.class b/build/classes/java/main/com/uca/core/GommetteCore.class index 82e0296ea262b3774ee8c472a8783921723dc10a..1a15aa11dc156a8e7304f53314aff391d9f3f036 100644 Binary files a/build/classes/java/main/com/uca/core/GommetteCore.class and b/build/classes/java/main/com/uca/core/GommetteCore.class differ diff --git a/build/classes/java/main/com/uca/core/ProfCore.class b/build/classes/java/main/com/uca/core/ProfCore.class index 83f15c85155fa6b387f7e6f8111bc2fc7494341c..55bceb62406e5bc6f4058e5700351a387f512b1c 100644 Binary files a/build/classes/java/main/com/uca/core/ProfCore.class and b/build/classes/java/main/com/uca/core/ProfCore.class differ diff --git a/build/classes/java/main/com/uca/core/UserCore.class b/build/classes/java/main/com/uca/core/UserCore.class index ab7aa73d910ef1dc2af3c0dbb0c90ad430c16df2..967395d68c8bb4d312bc877da67654c4a484570e 100644 Binary files a/build/classes/java/main/com/uca/core/UserCore.class and b/build/classes/java/main/com/uca/core/UserCore.class differ diff --git a/build/classes/java/main/com/uca/core/_DefaultCore.class b/build/classes/java/main/com/uca/core/_DefaultCore.class index 3a86ecbbbb2eadb80a0e764fdc187059d9fba4e4..c598d5f699838a69fd864c5bfc2b138a99599864 100644 Binary files a/build/classes/java/main/com/uca/core/_DefaultCore.class and b/build/classes/java/main/com/uca/core/_DefaultCore.class differ diff --git a/build/classes/java/main/com/uca/dao/EleveDAO.class b/build/classes/java/main/com/uca/dao/EleveDAO.class index 0b66c7ce84af00559efdb75715ecb80dea50d5d3..fbbc836c8aff5f70c18439ff056ce394061cb63f 100644 Binary files a/build/classes/java/main/com/uca/dao/EleveDAO.class and b/build/classes/java/main/com/uca/dao/EleveDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/GommetteAttribDAO.class b/build/classes/java/main/com/uca/dao/GommetteAttribDAO.class index c21e13f89fe6a2bad440a98440974e844a37adfe..22520a542be08daf8529f9a7168e96441a4b45ab 100644 Binary files a/build/classes/java/main/com/uca/dao/GommetteAttribDAO.class and b/build/classes/java/main/com/uca/dao/GommetteAttribDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/GommetteDAO.class b/build/classes/java/main/com/uca/dao/GommetteDAO.class index ea8517ea7603472770c8ff34da01f929a5011f37..609b5df8ae4b1ca6d4d4f1f9ad4161f4f5437fde 100644 Binary files a/build/classes/java/main/com/uca/dao/GommetteDAO.class and b/build/classes/java/main/com/uca/dao/GommetteDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/ProfDAO.class b/build/classes/java/main/com/uca/dao/ProfDAO.class index c16a352de66d250e99ee0a7aa5dd51e9e3ed07f1..2099620acf80af0590481fb32521b5dabdc769b3 100644 Binary files a/build/classes/java/main/com/uca/dao/ProfDAO.class and b/build/classes/java/main/com/uca/dao/ProfDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/UserDAO.class b/build/classes/java/main/com/uca/dao/UserDAO.class index 8b863cba5f49cef3baf524430c51747d08dc65c5..bbb931ba19152241f32b22e71c1de23746169ff0 100644 Binary files a/build/classes/java/main/com/uca/dao/UserDAO.class and b/build/classes/java/main/com/uca/dao/UserDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/_Connector.class b/build/classes/java/main/com/uca/dao/_Connector.class index f690492cbfcb1d74376127f03663d3eb036ccef6..6e8d84d3a8c39b9814a1a70fc4570df056c5580c 100644 Binary files a/build/classes/java/main/com/uca/dao/_Connector.class and b/build/classes/java/main/com/uca/dao/_Connector.class differ diff --git a/build/classes/java/main/com/uca/dao/_DefaultDAO.class b/build/classes/java/main/com/uca/dao/_DefaultDAO.class index 341cacc595be253857dcc691a6e49385be1fccdf..13c4e05666fe2a60c2e8dcba3ffa2708368479ed 100644 Binary files a/build/classes/java/main/com/uca/dao/_DefaultDAO.class and b/build/classes/java/main/com/uca/dao/_DefaultDAO.class differ diff --git a/build/classes/java/main/com/uca/dao/_Generic.class b/build/classes/java/main/com/uca/dao/_Generic.class index 55e705ae9188c4a6d18c59001e85047268be2a12..2bf1fb6474556f5272ba28ae3bea7e5b2458a377 100644 Binary files a/build/classes/java/main/com/uca/dao/_Generic.class and b/build/classes/java/main/com/uca/dao/_Generic.class differ diff --git a/build/classes/java/main/com/uca/dao/_Initializer.class b/build/classes/java/main/com/uca/dao/_Initializer.class index e77c5494380f2c13f163899051e2a2d58d26a64c..c102f8b94675252a73e7adadc3236fcb012ee7e0 100644 Binary files a/build/classes/java/main/com/uca/dao/_Initializer.class and b/build/classes/java/main/com/uca/dao/_Initializer.class differ diff --git a/build/classes/java/main/com/uca/entity/Couleur.class b/build/classes/java/main/com/uca/entity/Couleur.class index 2de6d27adcd0c5dadc462c7772bfd96a5f091f88..570225c8ae08858647041aaac29d6cd8be3de38a 100644 Binary files a/build/classes/java/main/com/uca/entity/Couleur.class and b/build/classes/java/main/com/uca/entity/Couleur.class differ diff --git a/build/classes/java/main/com/uca/entity/EleveEntity.class b/build/classes/java/main/com/uca/entity/EleveEntity.class index cd0cf66fe221726b9fd3f06509e1c8e6e5be7d91..99c7f96cbc820903772bdcb8b39696618f0518d6 100644 Binary files a/build/classes/java/main/com/uca/entity/EleveEntity.class and b/build/classes/java/main/com/uca/entity/EleveEntity.class differ diff --git a/build/classes/java/main/com/uca/entity/Entity.class b/build/classes/java/main/com/uca/entity/Entity.class index 41d7458508f8e9052b98c5e08faf60e0c306bfa2..e909969408545fb9178d2e3757ad18c004faf7c8 100644 Binary files a/build/classes/java/main/com/uca/entity/Entity.class and b/build/classes/java/main/com/uca/entity/Entity.class differ diff --git a/build/classes/java/main/com/uca/entity/GommetteAttribEntity.class b/build/classes/java/main/com/uca/entity/GommetteAttribEntity.class index 16a22933324b766df5e09f38b99dd80f7eb433dd..2176b36476df72b97fb2e51821eeb831ab837dad 100644 Binary files a/build/classes/java/main/com/uca/entity/GommetteAttribEntity.class and b/build/classes/java/main/com/uca/entity/GommetteAttribEntity.class differ diff --git a/build/classes/java/main/com/uca/entity/GommetteEntity.class b/build/classes/java/main/com/uca/entity/GommetteEntity.class index 971ac323997c5895f8e8548da4578384e520fa5c..bb623c57a665eb628db18da238aee38014998b73 100644 Binary files a/build/classes/java/main/com/uca/entity/GommetteEntity.class and b/build/classes/java/main/com/uca/entity/GommetteEntity.class differ diff --git a/build/classes/java/main/com/uca/entity/ProfEntity.class b/build/classes/java/main/com/uca/entity/ProfEntity.class index e97be26eca0ea69eb2a8da97c080a3e075b0886e..ef6b92ff957c7f717207c4d447411befe85eca71 100644 Binary files a/build/classes/java/main/com/uca/entity/ProfEntity.class and b/build/classes/java/main/com/uca/entity/ProfEntity.class differ diff --git a/build/classes/java/main/com/uca/entity/UserEntity.class b/build/classes/java/main/com/uca/entity/UserEntity.class index b72bf58ebb6d4f79bd1fc46800c1b62d1c2da081..cdbb6235504e599b344c6de96db554b3cdc24765 100644 Binary files a/build/classes/java/main/com/uca/entity/UserEntity.class and b/build/classes/java/main/com/uca/entity/UserEntity.class differ diff --git a/build/classes/java/main/com/uca/gui/DefaultGUI.class b/build/classes/java/main/com/uca/gui/DefaultGUI.class index 2e3bd9576ace17c3bd0b748453fe13444528791a..5844530b456828595ab7fffefdacf2dffc2cf6bd 100644 Binary files a/build/classes/java/main/com/uca/gui/DefaultGUI.class and b/build/classes/java/main/com/uca/gui/DefaultGUI.class differ diff --git a/build/classes/java/main/com/uca/gui/ProfGUI.class b/build/classes/java/main/com/uca/gui/ProfGUI.class index 9b89be821cc16df1065172be0fd51f0117549e1c..d68d23fa1d62c7e1cfc985c2f1d8c582e7acb19d 100644 Binary files a/build/classes/java/main/com/uca/gui/ProfGUI.class and b/build/classes/java/main/com/uca/gui/ProfGUI.class differ diff --git a/build/classes/java/main/com/uca/gui/UserGUI.class b/build/classes/java/main/com/uca/gui/UserGUI.class index c36a9d811de41b257db95a33ecd924b1015ff4ee..b19b5679288ec1eeed09841fe6be0238ff8688f5 100644 Binary files a/build/classes/java/main/com/uca/gui/UserGUI.class and b/build/classes/java/main/com/uca/gui/UserGUI.class differ diff --git a/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class b/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class index 0bb0cf69fb21b6a17bee4077213a5fe363dbfa26..38a2af9fcbac0d798edc7d0be1327d949f46d666 100644 Binary files a/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class and b/build/classes/java/main/com/uca/gui/_FreeMarkerInitializer.class differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 696af7713ba6696ab5d66308658b2e9599f92e85..d52c4ef8f81a68d60df347c73a1dd7add84c0197 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/com/uca/StartServer.java b/src/com/uca/StartServer.java index f92f3823fc523492fea7d22f16e415dc1ea623f7..adf9890eeaa0d2ae697b6cce915315dd08b46e19 100644 --- a/src/com/uca/StartServer.java +++ b/src/com/uca/StartServer.java @@ -35,5 +35,10 @@ public class StartServer { get("/profs", (req, res) -> { return ProfGUI.getAllProfs(); }); + + get("/profs/delete/:id",(req,res) -> { + ProfGUI.delete(req.params(":id")); + return ProfGUI.getAllProfs(); + }); } } \ No newline at end of file diff --git a/src/com/uca/core/UserCore.java b/src/com/uca/core/UserCore.java index 60da4a86697149b969b936fa7e937fbc3bd8c6dc..03fbef6519de365c48f46aac13fb79f4a328a724 100644 --- a/src/com/uca/core/UserCore.java +++ b/src/com/uca/core/UserCore.java @@ -8,6 +8,7 @@ import java.util.*; public class UserCore extends _DefaultCore<UserEntity> { public static final UserCore Instance = new UserCore(); + private UserCore() { super(new UserDAO()); diff --git a/src/com/uca/core/_DefaultCore.java b/src/com/uca/core/_DefaultCore.java index 58809c3c69e9113deeae0fbb233bc3c85c4ea8cd..3bf16bf7795d8d9559bb497e9b24ff28a438aa31 100644 --- a/src/com/uca/core/_DefaultCore.java +++ b/src/com/uca/core/_DefaultCore.java @@ -17,6 +17,7 @@ public abstract class _DefaultCore<T extends Entity> { public List<T> getAll() { return dao.getAll(); } public T push(T obj) { return dao.push(obj); } - public void delete(T obj) { dao.push(obj); } + public void delete(T obj) { dao.delete(obj); } + public void delete(int id) { dao.delete(id); } public T getById(int id) {return dao.getById(id); } } diff --git a/src/com/uca/dao/_DefaultDAO.java b/src/com/uca/dao/_DefaultDAO.java index 95f54d5b7e056ceed4c71b80cdec7330274b0332..9a61b8efdaa0567e22080fe26e74ed73933195d1 100644 --- a/src/com/uca/dao/_DefaultDAO.java +++ b/src/com/uca/dao/_DefaultDAO.java @@ -117,8 +117,8 @@ public abstract class _DefaultDAO<T extends Entity> extends _Generic<T> { public void delete(int id) { try { PreparedStatement stmt = this.connect.prepareStatement("DELETE FROM " + getDefaultTableName() +" WHERE id = ?;"); - stmt.setInt (1, id); - ResultSet rs = stmt.executeQuery() ; + stmt.setInt(1, id); + stmt.executeUpdate() ; } catch (SQLException e) { e.printStackTrace(); } diff --git a/src/com/uca/dao/_Initializer.java b/src/com/uca/dao/_Initializer.java index bd385fa01473b367f680fa5f7124ca233248deec..745ec227cae70000c7b34982b86076e5ad3d290d 100644 --- a/src/com/uca/dao/_Initializer.java +++ b/src/com/uca/dao/_Initializer.java @@ -31,8 +31,8 @@ public class _Initializer { } public static void Init(){ - DropTable("users"); - DropTable("profs"); + //DropTable("users"); + //DropTable("profs"); CreateTable("CREATE TABLE IF NOT EXISTS users (id int primary key auto_increment, firstname varchar(100), lastname varchar(100));"); CreateTable("CREATE TABLE IF NOT EXISTS profs (id int primary key auto_increment, firstname varchar(100), lastname varchar(100), username varchar(100));"); //CreateTable("CREATE TABLE IF NOT EXISTS eleves(id int primary key auto_increment, firstname varchar(100), lastname varchar(100), nomClasse varchar(100), dateNaissance varchar(10));"); diff --git a/src/com/uca/gui/ProfGUI.java b/src/com/uca/gui/ProfGUI.java index 8e5e1ae00a8de1c68dc78fd12300f539efd6b50a..595d74737905209dbaa1adb2266a3aa5330ed8f5 100644 --- a/src/com/uca/gui/ProfGUI.java +++ b/src/com/uca/gui/ProfGUI.java @@ -13,4 +13,9 @@ public class ProfGUI input.put("profs", Core.Prof.getAll()); return DefaultGUI.getDefaultGUI(input, "profs.ftl"); } + + public static void delete(String id) + { + Core.Prof.delete(Core.Prof.getById(Integer.parseInt(id))); + } } diff --git a/src/com/uca/gui/UserGUI.java b/src/com/uca/gui/UserGUI.java index e8c5ae39b61798456345501f93ce4053955474ba..c58bc8b2c4f7aa7fd6c3db1c16939514097d27e5 100644 --- a/src/com/uca/gui/UserGUI.java +++ b/src/com/uca/gui/UserGUI.java @@ -13,4 +13,8 @@ public class UserGUI input.put("users", Core.User.getAll()); return DefaultGUI.getDefaultGUI(input, "users.ftl"); } + + } + +