Merge pull request 'chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.22.final' (#21 ) from renovate/hibernate.version into main

Reviewed-on: #21
chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.22.final
2025-09-07 12:41:08 +02:00 · 2025-09-07 12:38:08 +02:00 · 2025-09-07 12:38:00 +02:00 · 2025-07-25 07:30:29 +00:00 · 2025-06-05 17:33:34 +02:00 · 2025-06-05 17:33:26 +02:00
132 changed files with 8445 additions and 568 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,4 @@
+.settings/
+MacOSX11.3.sdk
+MacOSX11.3.sdk.tar.xz
+packages
--- a/FyneApp.toml
+++ b/FyneApp.toml
@ -0,0 +1,6 @@
+[Default]
+Icon = "Icon.png"
+Name = "JavaWebStarter"
+ID = "com.hegenberg.app"
+Version = "0.0.1"
+Build = 1
--- a/Icon.png
+++ b/Icon.png
--- a/README.md
+++ b/README.md
@ -1,103 +1,177 @@
-# JakartaEE & Spring Boot Starter
+# Java Web Starter (JWS) - University Project Environment Initializer

-This application is a GUI tool developed in Go using the Fyne framework (v2.5.4). It helps users set up a development environment for JakartaEE and Spring Boot projects by checking and installing necessary dependencies, and then allowing users to deploy starter projects.
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) **Dieses Projekt entstand im Rahmen einer wissenschaftlichen Hausarbeit im Modul "Programmieren von Webanwendungen" an der IU Internationale Hochschule.**

-## Features
+## Inhaltsverzeichnis

- _Dependency Check_: Verifies the installation of required tools (Visual Studio Code and Docker).
+- [Motivation / Problemstellung](#motivation--problemstellung)
+- [Lösungsansatz](#lösungsansatz)
+- [Kernfunktionen](#kernfunktionen)
+- [Technologie-Stack](#technologie-stack)
+- [Zielgruppe](#zielgruppe)
+- [Installation](#installation)
+  - [Voraussetzungen](#voraussetzungen)
+  - [Über Releases (Empfohlen)](#über-releases-empfohlen)
+  - [Aus dem Quellcode bauen](#aus-dem-quellcode-bauen)
+- [Benutzung](#benutzung)
+- [Enthaltene Projekt-Templates](#enthaltene-projekt-templates)
+- [Funktionsweise (Dev Container)](#funktionsweise-dev-container)
+- [Bekannte Probleme / Limitationen](#bekannte-probleme--limitationen)
+- [Zukünftige Arbeit / Ausblick](#zukünftige-arbeit--ausblick)
+- [Beitragen](#beitragen)
+- [Lizenz](#lizenz)
+- [Danksagung](#danksagung)

- _Automatic Installation_: Offers to install missing dependencies on supported platforms.
+## Motivation / Problemstellung

- _Project Selection_: Provides a list of starter projects for JakartaEE and Spring Boot.
+Die Einrichtung adäquater Entwicklungsumgebungen stellt besonders in der Lehre eine signifikante Hürde dar. Studierende nutzen oft heterogene Systeme (Betriebssysteme, installierte Software, Konfigurationen), was häufig zu Kompatibilitätsproblemen, zeitaufwendiger Fehlersuche und dem bekannten „Works on my machine“-Problem führt. Dies verursacht Frustration, erhöht den Betreuungsaufwand und lenkt vom eigentlichen Lerninhalt ab. Besonders bei komplexen Technologie-Stacks, wie sie in der Webentwicklung mit Java (z.B. Jakarta EE, Spring Boot, Datenbanken) üblich sind, ist die manuelle Konfiguration fehleranfällig.

- _Project Deployment_: Allows users to deploy selected projects and open them in Visual Studio Code with dev containers.
+## Lösungsansatz

-## Prerequisites
+Dieses Projekt bietet eine plattformübergreifende Desktop-Anwendung (`jws`), die den Prozess der Bereitstellung standardisierter Entwicklungsumgebungen für universitäre Java-Webprojekte radikal vereinfacht. Unter Nutzung von **Docker** für die Containerisierung und dem **Dev Container Standard** ermöglicht das Tool Studierenden, mit wenigen Klicks eine vorkonfigurierte, lauffähige und konsistente Umgebung für spezifische Projektvorlagen zu initialisieren.

- Go 1.23 or later
+Das Tool wurde in **Go** mit dem **Fyne** GUI-Toolkit entwickelt, um native Ausführbarkeit unter Windows, macOS und Linux zu gewährleisten

- Fyne v2.5.4
+## Kernfunktionen
+
+- **Plattformübergreifend:** Läuft nativ unter Windows, macOS und Linux.
+- **Abhängigkeitsprüfung:** Überprüft automatisch, ob Docker Desktop und Visual Studio Code installiert sind.
+- **Automatisierte Installation:** Bietet an, fehlende Abhängigkeiten (Docker Desktop, VS Code) systemabhängig zu installieren:
+  - **Windows:** Nutzt Winget (prüft auch auf WSL).
+  - **macOS:** Nutzt Homebrew (installiert Homebrew bei Bedarf).
+  - **Linux:** Nutzt distributionsspezifische Methoden (dpkg/dnf für VS Code, Docker-Installationsskripte).
+- **Template-Auswahl:** Bietet eine Auswahl vordefinierter Starter-Projektvorlagen.
+- **Lokales Deployment:** Kopiert die ausgewählten Template-Dateien in ein vom Benutzer gewähltes Verzeichnis.
+- **VS Code Integration:** Öffnet das erstellte Projektverzeichnis automatisch in Visual Studio Code.
+- **Vorkonfigurierte Umgebungen:** Jedes Template enthält:
+  - `Dockerfile(s)`: Definiert das Basis-Image mit JDK, Build-Tools etc..
+  - `docker-compose.yml`: Definiert die Dienste (App-Container, PostgreSQL-Datenbank, ggf. Runtime-Container wie Open Liberty) und Netzwerke.
+  - `devcontainer.json`: Konfiguriert VS Code für die Nutzung des Containers, installiert notwendige Extensions (z.B. Java Extension Pack) und richtet Port-Weiterleitungen ein.
+  - Projekt-Grundgerüst mit vorkonfigurierter Hibernate-Datenbankanbindung.
+
+## Technologie-Stack
+
+- **Kernanwendung:** Go, Fyne Toolkit
+- **Containerisierung:** Docker, Docker Compose
+- **Standardisierung:** Dev Container Standard (`devcontainer.json`)
+- **Ziel-IDE:** Visual Studio Code
+- **Abhängigkeitsinstallation (Helfer):** Winget (Windows), Homebrew (macOS), Shell-Befehle (Linux)
+- **Projekt-Templates:**
+  - Java Frameworks: Jakarta EE (Servlet/JSP, JSF, REST), Spring Boot (REST)
+  - Persistenz: Hibernate (JPA)
+  - Datenbank: PostgreSQL
+  - Build-Tools: Maven / Gradle (implizit)
+
+## Zielgruppe
+
+- **Studierende:** Insbesondere in Informatik- und Wirtschaftsinformatik-Studiengängen, die Java-Webanwendungen programmieren und eine einfache, fehlerfreie Setup-Erfahrung wünschen.
+- **Lehrende:** Die ihren Studierenden standardisierte Umgebungen zur Verfügung stellen möchten, um den Support-Aufwand zu reduzieren und die Konzentration auf Lerninhalte zu fördern.

 ## Installation

-### Option 1: Download Pre-built Binary
+### Voraussetzungen

-Go to the Releases page of this repository.
+- Ein unterstütztes Betriebssystem: Windows 10/11, macOS, gängige Linux-Distributionen (getestet unter Mint, Ubuntu, Fedora).
+- Administratorrechte (werden ggf. für die Installation von Docker/VS Code benötigt).
+- Unter Windows: Eine funktionierende Winget-Installation wird empfohlen/benötigt für die automatische Installation. WSL wird ggf. benötigt und aktiviert.
+- Unter macOS: Homebrew wird empfohlen/benötigt (kann vom Tool installiert werden).
+- Für das Bauen aus dem Quellcode: Eine aktuelle Go-Installation.

-Download the appropriate binary for your operating system.
+### Über Releases (Empfohlen)

-### Option 2: Build from Source
+Die einfachste Methode ist das Herunterladen einer vorkompilierten Version für Ihr Betriebssystem von der [**Releases-Seite**](https://codeberg.org/Pata1704/jws_gui/releases) . Laden Sie die passende Datei herunter, entpacken Sie sie ggf. und führen Sie die `jws` aus.

- Clone the repository:
-
-```bash
-git clone https://github.com/yourusername/jws_gui.git
-```
-
-Navigate to the project directory:
+### Aus dem Quellcode bauen

+1.  Klonen Sie das Repository:
    ```bash
+    git clone https://codeberg.org/Pata1704/jws_gui.git
    cd jws_gui
    ```
-
-Install dependencies:
-
-The list of dependencies required for the development of Fyne Apps can be found at “https://docs.fyne.io/started/”.
-
+2.  Installieren Sie die von [Fyne](https://docs.fyne.io/started/) definierten Abhängigkeiten für ihr Betriebssytem
+3.  Bauen Sie die Anwendung:
    ```bash
-go mod tidy
+    go build .
    ```
+    Dies erstellt die ausführbare Datei `jws` (oder `jws.exe` unter Windows) im aktuellen Verzeichnis.

-Build the application:
+## Benutzung

+1.  **Starten Sie die Anwendung** (`jws`). Ein Info-Fenster weist auf wichtige Punkte hin.
+2.  **Abhängigkeits-Check:** Die Anwendung prüft, ob Docker Desktop und Visual Studio Code installiert sind ("Dependency Screen").
+    - Falls etwas fehlt, klicken Sie auf die entsprechenden Buttons, um die Installation anzustoßen. Folgen Sie den Anweisungen (ggf. sind Admin-Rechte nötig). Ein Fortschrittsbalken wird angezeigt.
+3.  **Template-Auswahl:** Sobald alle Abhängigkeiten erfüllt sind, gelangen Sie zum "Project Screen". Wählen Sie hier das gewünschte Projekt-Template aus (z.B. "JakartaEE Todo-App mit JSP").
+4.  **Deployment:** Klicken Sie auf "Deploy". Wählen Sie im Dialog einen Zielordner auf Ihrem Rechner aus und bestätigen Sie. Die Template-Dateien werden dorthin kopiert.
+5.  **Öffnen in VS Code:** Die Anwendung öffnet das erstellte Projektverzeichnis automatisch in Visual Studio Code.
+6.  **In Container öffnen:**
+    - Stellen Sie sicher, dass Docker Desktop läuft.
+    - VS Code sollte eine Benachrichtigung anzeigen: "Folder contains a Dev Container configuration file. Reopen folder to develop in a container?". Klicken Sie auf "**Reopen in Container**".
+    - (Falls die Benachrichtigung nicht erscheint: Klicken Sie auf das blaue Icon `><` unten links in der VS Code Statusleiste oder nutzen Sie die Befehlspalette (Ctrl+Shift+P) und suchen Sie nach "Dev Containers: Reopen in Container".
+7.  **Build & Run:** Docker/VS Code bauen nun das Image und starten die Container (dies kann beim ersten Mal etwas dauern). Sobald die Umgebung bereit ist, können Sie im integrierten Terminal von VS Code arbeiten, als wären Sie direkt im Container.
+    - **Beispiel (für JakartaEE JSP Template):** Führen Sie im VS Code Terminal aus:
      ```bash
-go build
+      mvn clean package && sudo cp target/*.war /app/
      ```
+      Dieser Befehl kompiliert das Projekt und kopiert die `.war`-Datei in das Deployment-Verzeichnis des laufenden OpenLiberty-Servers.
+8.  **Zugriff:** Nach kurzer Zeit ist die Beispielanwendung im Browser unter `http://localhost:9080/todo-app` (oder einem ähnlichen Port/Pfad je nach Template) erreichbar.

-## Usage
+Sie haben nun eine funktionierende, containerisierte Entwicklungsumgebung, ohne sich manuell um Installationen oder Konfigurationen kümmern zu müssen!

-Run the application:
+## Enthaltene Projekt-Templates

-If you downloaded a pre-built binary:
+Aktuell sind folgende Templates enthalten:

-```bash
-./jakartaee-springboot-starter
-```
+1.  Jakarta EE mit Servlet/JSP
+2.  Jakarta EE mit JSF
+3.  Jakarta EE mit REST (JAX-RS)
+4.  Spring Boot mit REST

-or by double-clicking the excutable.
+Alle Templates beinhalten eine PostgreSQL-Datenbankanbindung via Hibernate/JPA.

-If you built from source:
+## Funktionsweise (Dev Container)

-```bash
-./jakartaee-springboot-starter
-```
+Der Kern der Standardisierung basiert auf dem **Dev Container Standard**:

-The application will launch a GUI window where you can:
+1.  Die `devcontainer.json`-Datei im Projektwurzelverzeichnis teilt VS Code mit, wie die Entwicklungsumgebung konfiguriert ist.
+2.  Sie verweist meist auf eine `docker-compose.yml`-Datei, die die notwendigen Dienste (Applikationscontainer, Datenbank etc.) definiert.
+3.  Die `Dockerfile(s)` definieren, wie die einzelnen Container-Images gebaut werden (Basis-Image, JDK, Tools, Abhängigkeiten).
+4.  Wenn Sie das Projekt in VS Code "im Container öffnen", startet VS Code die definierten Docker-Container und verbindet sich mit dem spezifizierten Entwicklungscontainer.
+5.  VS Code installiert automatisch die in der `devcontainer.json` festgelegten Extensions _innerhalb_ des Containers.
+6.  Sie arbeiten in VS Code (Terminal, Debugger, Code-Editor) nahtlos innerhalb dieser isolierten, vorkonfigurierten Umgebung.

-1. Check and install dependencies (Visual Studio Code and Docker).
-2. Select a starter project from the available options.
-3. Deploy the selected project and open it in Visual Studio Code.
+Dies stellt sicher, dass alle Nutzer exakt die gleiche Umgebung mit den richtigen Werkzeugversionen und Abhängigkeiten haben, unabhängig von ihrem lokalen System.

-## Project Structure
+## Bekannte Probleme / Limitationen

-_TODO_
+- **SELinux (Fedora):** Unter Fedora mit aktiviertem SELinux kann es zu Problemen beim Mounten von Host-Verzeichnissen in Docker-Containern kommen. Ein Workaround ist `sudo setenforce 0` (nicht empfohlen), eine korrekte SELinux-Konfiguration für Docker ist komplexer.
+- **Abhängigkeit von Paketmanagern:** Die automatische Installation hängt vom Funktionieren externer Tools wie Winget und Homebrew ab. Fehler in diesen Tools können die Installation behindern.
+- **Manuelle Schritte:** Docker Desktop muss manuell gestartet werden, bevor "Reopen in Container" funktioniert
+- **Installation Robustheit:** Obwohl auf mehreren Systemen getestet, kann es auf spezifischen Konfigurationen zu Problemen kommen
+- **Evaluation:** Bisher hauptsächlich technisch und durch Experten-Feedback evaluiert. Eine breite Evaluation mit Studierenden (Usability, Zeitersparnis) steht noch aus

-## Customization
+## Zukünftige Arbeit / Ausblick

-To add new starter projects:
+- Verbesserung der Robustheit der Installationsprozesse
+- UI-Verbesserungen und automatische Sprachanpassung
+- Erweiterung um zusätzliche Templates (z.B. andere Java-Versionen, Microservices, spezifische Bibliotheken)
+- Plugin-System für Lehrende zur einfachen Erstellung eigener Templates
+- Unterstützung für Git-Repositories als Template-Quelle
+- Einführung einer Wahl der IDE (IntelliJ IDEA, Eclipse, NeoVim, Zed, Fleet)
+- Umfassende quantitative Evaluation

-1. Create a new project template in the projects/ directory.
-2. Add the project details to the projects.json file.
+## Beitragen

-## Contributing
+Beiträge sind willkommen!

-Contributions are welcome! Please feel free to submit a Pull Request.
+## Software Bill of Materials (SBOM)
+Das SBOM dieses Projekts finden Sie unter [sbom.json](sbom.json).

-License
-[Insert your chosen license here]
+## Lizenz

-## Acknowledgments
+Dieses Projekt ist lizenziert unter der MIT Lizenz

- Fyne: https://fyne.io/
- JakartaEE: https://jakarta.ee/
- Spring Boot: https://spring.io/projects/spring-boot
+## Danksagung
+
+- Danke an meinem Dozenten im Modul "Programmieren von Webanwendungen" für die Betreuung der ursprünglichen Hausarbeit.
+- Danke an die Teilnehmer der Umfrage für ihr wertvolles Feedback.
+- Inspiration durch die Konzepte von Docker, Dev Containers und die Arbeiten von Malan et al. und Valstar et al. .
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,81 @@
+#!/bin/bash
+set -e
+
+# Prüfe auf erforderliches Versions-Argument
+if [ -z "$1" ]; then
+  echo "Fehler: App-Version muss als Parameter angegeben werden (z.B. ./build.sh 0.0.1)"
+  exit 1
+fi
+
+APP_VERSION="$1"
+APP_ID="com.hegenberg.javastarter"
+APP_BUILD="1"
+NAME="jws"
+ICON="Icon.png"
+SDK_PATH="./MacOSX11.3.sdk"
+
+# Lösche vorhandenen packages-Ordner und erstelle neu
+if [ -d "packages" ]; then
+  echo "Entferne vorhandenen packages-Ordner..."
+  rm -rf packages
+fi
+mkdir -p packages
+
+# Build-Funktion für Mac
+build_mac() {
+  local arch="$1"
+  echo "Baue Mac $arch Version..."
+  fyne-cross darwin \
+    -app-id "$APP_ID" \
+    -app-build "$APP_BUILD" \
+    -app-version "$APP_VERSION" \
+    -icon "$ICON" \
+    -name "$NAME" \
+    -arch "$arch" \
+    -macosx-sdk-path "$SDK_PATH" \
+    -ldflags "-s" \
+    -ldflags "-w" \
+    ./cmd/jws
+
+  # Verpacke die App
+  local dist_dir="fyne-cross/dist/darwin-${arch}/jws.app"
+  tar -cJf "packages/jws_mac_${arch}.tar.xz" "$dist_dir"
+}
+
+# Bauen für Mac-Architekturen
+for arch in arm64 amd64; do
+  build_mac "$arch"
+done
+
+# Build Windows
+echo "Baue Windows Version..."
+fyne-cross windows \
+  -app-id "$APP_ID" \
+  -app-build "$APP_BUILD" \
+  -app-version "$APP_VERSION" \
+  -icon "$ICON" \
+  -name "$NAME.exe" \
+    -ldflags "-s" \
+    -ldflags "-w" \
+    -ldflags "-H=windowsgui" \
+  ./cmd/jws
+
+mv fyne-cross/dist/windows-amd64/jws.exe.zip packages/jws_windows.zip
+
+# Build Linux
+echo "Baue Linux Version..."
+# Erstelle selbstentpackendes Bundle
+fyne package --target linux --exe ./jws --name "$NAME" --appVersion "$APP_VERSION" --sourceDir ./cmd/jws
+# Erstelle einfache Executable
+fyne build ./cmd/jws
+
+# Verpacke Linux-Versionen
+tar -cJf packages/jws_linux_exe.tar.xz ./jws
+tar -cJf packages/jws_linux_bundle.tar.xz ./jws.tar.xz
+
+echo "Performing Clean Up"
+rm -rf fyne-cross
+rm jws jws.tar.xz
+
+echo "Build abgeschlossen! Dateien finden sich im packages-Ordner:"
+ls -lh packages/
--- a/changelog.md
+++ b/changelog.md
@ -0,0 +1,96 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## [0.6.0] - 2025-03-30
+
+### 📚 Documentation
+
+- Update README
+
+## [0.5.0] - 2025-03-23
+
+### 🚀 Features
+
+- Add jakarta rest todo implementation with devcontainer setup
+- Added complete example for spring boot rest service with devcontainer
+
+### 📚 Documentation
+
+- Update changelog.md
+
+## [0.4.0] - 2025-03-21
+
+### 🚀 Features
+
+- Optimize software installation on windows and add information splash screen on startup
+- Add complete example for Jakarta Faces and a devcontainer setup
+
+### 💼 Other
+
+- Add clean up step to build.sh
+
+### 📚 Documentation
+
+- Update changelog
+
+## [0.3.0] - 2025-03-21
+
+### 🚀 Features
+
+- Finalize jakarta-jsp devcontainer setup
+
+### 🐛 Bug Fixes
+
+- Reorder wsl checks on windows docker installation to reduce executation if elevated privileges
+
+### 📚 Documentation
+
+- Update changelog
+
+## [0.2.0] - 2025-03-20
+
+### 🚀 Features
+
+- Add jakarta-todo-jsp implementation
+- Improve usability by including a progressbar while installing packages on windows and mac
+- Improve docker installation process by adding wsl feature activation
+
+### 🐛 Bug Fixes
+
+- Reanble window resize to better support multi monitor setups with different resolutions
+- Disable password dialog on windows
+
+### ⚙️ Miscellaneous Tasks
+
+- Add .devcontainer directory to jakarta jsp project directory
+
+## [0.1.0] - 2025-03-19
+
+### 🚀 Features
+
+- Add config and structured logging
+- Add first simple jakartaee10-servlet project
+
+### 📚 Documentation
+
+- Add changelog.md
+- Fix missing version info in changelog.md
+
+## [0.0.2] - 2025-03-17
+
+### 🚀 Features
+
+- Add simple spring-boot-todo-microservice
+
+## [0.0.1] - 2025-03-14
+
+### 🚀 Features
+
+- Initial project commit
+
+### 📚 Documentation
+
+- Update README
+
+<!-- generated by git-cliff -->
--- a/cmd/jws/Icon.png
+++ b/cmd/jws/Icon.png
--- a/cmd/jws/main.go
+++ b/cmd/jws/main.go
@ -1,19 +1,24 @@
-// cmd/jws/main.go
 package main

 import (
 	"embed"
 	"encoding/json"
 	"fmt"
+	"jws/internal/config"
 	"jws/internal/dependency"
 	"jws/internal/gui"
+	"jws/internal/logger"
 	"jws/internal/project"
+	"log/slog"
 	"os"
+	"path/filepath"

 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/app"
+	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/dialog"
 	"fyne.io/fyne/v2/theme"
+	"fyne.io/fyne/v2/widget"
 )

 //go:embed all:projects
@ -26,23 +31,78 @@ var (
 )

 func main() {
+	config, err := config.LoadConfig()
+	if err != nil {
+		fmt.Printf("error loading config: %v\n", err)
+		os.Exit(1)
+	}
+
+	logLevel := slog.LevelInfo
+	if config.LogLevel == "debug" {
+		logLevel = slog.LevelDebug
+	}
+
+	err = logger.Init(config.LogFilePath, logLevel)
+	if err != nil {
+		fmt.Printf("error initializing logger: %v\n", err)
+		os.Exit(1)
+	}
+
+	logger.Logger.Info("Application started")
 	a := app.New()
+
+	showSplashScreen(a, func() {
+		createMainWindow(a, config)
+	})
+
+	a.Run()
+}
+
+func showSplashScreen(a fyne.App, onComplete func()) {
+	splash := a.NewWindow("Important Information")
+	splash.SetFixedSize(true)
+	splash.CenterOnScreen()
+	splash.SetPadded(true)
+
+	title := widget.NewLabel("JakartaEE & Spring Boot Starter")
+	title.TextStyle = fyne.TextStyle{Bold: true}
+	title.Alignment = fyne.TextAlignCenter
+
+	infoText := widget.NewLabel("Please note:\n\n" +
+		"• On Windows, a functional Winget installation is required.\n" +
+		"• Administrator rights may be needed at some points.\n\n" +
+		"Click 'Continue' when you're ready to proceed.")
+	infoText.Wrapping = fyne.TextWrapWord
+
+	continueButton := widget.NewButton("Continue", func() {
+		splash.Close()
+		onComplete()
+	})
+
+	content := container.NewVBox(
+		title,
+		infoText,
+		continueButton,
+	)
+
+	splash.SetContent(content)
+	splash.Show()
+}
+
+func createMainWindow(a fyne.App, config *config.Config) {
 	mainWindow = a.NewWindow("JakartaEE & Spring Boot Starter")
 	mainWindow.Resize(fyne.NewSize(600, 600))
-	mainWindow.SetFixedSize(true)

-	// Initialize dependencies
 	dependencies = []dependency.Dependency{
 		{Name: "Visual Studio Code", Installed: false, Icon: theme.DocumentIcon()},
 		{Name: "Docker", Installed: false, Icon: theme.MediaPlayIcon()},
 	}

-	// Standard projects
 	standartProjects := []project.Project{
 		{
-			Name:        "JakartaEE Todo-App mit Servlet",
-			Description: "Eine Todo-Anwendung mit Jakarta Servlet und\nPostgreSQL-Datenbank.",
-			FolderName:  "jakarta-servlet-todo",
+			Name:        "JakartaEE Todo-App mit Server Faces",
+			Description: "Eine Todo-Anwendung mit Jakarta Faces und\nPostgreSQL-Datenbank.",
+			FolderName:  "jakarta-faces-todo",
 		},
 		{
 			Name:        "JakartaEE Todo-App mit JSP",
@ -61,8 +121,7 @@ func main() {
 		},
 	}

-	// Load additional projects from projects.json
-	pluginProjects, err := loadProjects("projects.json")
+	pluginProjects, err := loadProjects(filepath.Join(config.ProjectsPath, "projects.json"))
 	if err != nil {
 		dialog.ShowError(fmt.Errorf("error loading projects: %v", err), mainWindow)
 		return
@ -70,10 +129,9 @@ func main() {

 	projects = append(standartProjects, pluginProjects...)

-	// Initialize GUI package
 	gui.Init(mainWindow, dependencies, projects, projectsFS)
+	project.Init(projects, config)

-	// Check dependencies
 	dependency.CheckDependencies(dependencies)
 	allInstalled := true
 	for _, dep := range dependencies {
@ -83,14 +141,13 @@ func main() {
 		}
 	}

-	// Show appropriate screen
 	if allInstalled {
 		gui.ShowProjectScreen()
 	} else {
 		gui.ShowDependencyScreen()
 	}

-	mainWindow.ShowAndRun()
+	mainWindow.Show()
 }

 func loadProjects(filePath string) ([]project.Project, error) {
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.dockerignore
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.dockerignore
@ -0,0 +1,8 @@
+.git
+.github
+.settings
+target
+*.iml
+.idea
+.vscode
+node_modules
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.gitignore
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.gitignore
@ -0,0 +1,27 @@
+# Maven
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# IDE-spezifische Dateien
+.idea/
+*.iws
+*.iml
+*.ipr
+.vscode/
+.settings/
+.classpath
+.project
+.factorypath
+
+# Temporäre Dateien
+*.log
+*.tmp
+*.temp
+
+# Lokale Konfigurationsdateien
+src/main/resources/application-local.properties
+
+# Devcontainer Volumen
+.devcontainer/postgres-data/
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile
@ -0,0 +1,12 @@
+FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
+
+COPY --chown=1001:0 src/main/liberty/config /config
+# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
+RUN mkdir -p /config/lib && \
+    curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar
+
+RUN features.sh
+
+#COPY --chown=1001:0 target/*.war /config/apps
+
+RUN configure.sh
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile.dev
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile.dev
@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+
+#ARG INSTALL_MAVEN="true"
+#ARG MAVEN_VERSION=""
+
+#ARG INSTALL_GRADLE="false"
+#ARG GRADLE_VERSION=""
+
+#RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+#  && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+
+# Hier kannst du zusätzliche Tools oder Bibliotheken installieren, die du für die Entwicklung benötigst.
+# Zum Beispiel den PostgreSQL JDBC-Treiber, wenn du ihn für die Entwicklung benötigst:
+RUN apt-get update && apt-get install -y curl && curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/devcontainer.json
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/devcontainer.json
@ -0,0 +1,14 @@
+{
+  "name": "Java & PostgreSQL",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "forwardPorts": [9080, 5432, 9433],
+  "postCreateCommand": "mvn clean install -DskipTests",
+  "remoteUser": "vscode",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
+    "ghcr.io/devcontainers-extra/features/maven-sdkman:2": {"version": "latest"},
+    "ghcr.io/devcontainers/features/git:1": {"version": "latest"}
+}
+}
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/docker-compose.yml
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/docker-compose.yml
@ -0,0 +1,60 @@
+services:
+    app:
+        container_name: javadev
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile.dev
+        volumes:
+            - ../..:/workspaces:cached
+            - ./app:/app
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        networks:
+            - my_network
+        command: sleep infinity
+
+    openliberty:
+        container_name: openliberty_app
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile
+        ports:
+            - "9080:9080"
+            - "9443:9443"
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: todo_db
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        volumes:
+            - ./app:/config/dropins
+        depends_on:
+            - db
+        networks:
+            - my_network
+
+    db:
+        container_name: postgresdb
+        image: postgres:latest
+        restart: unless-stopped
+        volumes:
+            - postgres-data:/var/lib/postgresql/data
+            - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+        environment:
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_DB: todo_db
+        networks:
+            - my_network
+
+volumes:
+    postgres-data:
+
+networks:
+    my_network:
+        driver: bridge
--- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/init.sql
+++ b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/init.sql
@ -0,0 +1,17 @@
+CREATE TABLE users (
+    id SERIAL PRIMARY KEY,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(255) NOT NULL,
+    email VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE todos (
+    id SERIAL PRIMARY KEY,
+    title VARCHAR(255) NOT NULL,
+    description VARCHAR(1000),
+    target_date DATE,
+    completed BOOLEAN,
+    user_id BIGINT NOT NULL,
+    FOREIGN KEY (user_id) REFERENCES users(id)
+);
+
--- a/cmd/jws/projects/jakarta-faces-todo/pom.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/pom.xml
@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.todoapp</groupId>
+    <artifactId>todo-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <hibernate.version>6.6.22.Final</hibernate.version>
+        <postgresql.version>42.7.6</postgresql.version>
+    </properties>
+
+    <dependencies>
+        <!-- Jakarta EE 10 API -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakartaee.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Hibernate Core -->
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+
+        <!-- PostgreSQL JDBC Driver -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-api</artifactId>
+            <version>2.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+
+<dependency>
+    <groupId>org.hibernate.orm</groupId>
+    <artifactId>hibernate-core</artifactId>
+    <version>7.0.0.Final</version>  <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
+</dependency>
+        <!-- Mindestens zum Passwort-Hashing -->
+        <dependency>
+            <groupId>at.favre.lib</groupId>
+            <artifactId>bcrypt</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>todo-app</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+            </plugin>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>3.11.4</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/cmd/jws/projects/jakarta-faces-todo/server.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/server.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="OpenLiberty Todo App Server">
+
+    <featureManager>
+        <feature>servlet-6.0</feature>
+        <feature>pages-3.1</feature>
+        <feature>jdbc-4.2</feature>
+        <feature>jndi-1.0</feature>
+        <feature>monitor-1.0</feature>
+        <feature>faces-4.0</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint"
+                  httpPort="9080"
+                  httpsPort="9443" />
+
+    <applicationManager autoExpand="true" />
+
+    <dataSource id="PostgresDataSource">
+        <jdbcDriver libraryRef="PostgresLib" />
+        <properties.postgresql serverName="postgres"
+                              portNumber="5432"
+                              databaseName="todo_db"
+                              user="postgres"
+                              password="postgres" />
+    </dataSource>
+
+    <library id="PostgresLib">
+        <fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
+    </library>
+
+    <webApplication location="todo-app.war" contextRoot="/todo-app" />
+
+</server>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/AuthBean.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/AuthBean.java
@ -0,0 +1,133 @@
+package com.todoapp.bean;
+
+import at.favre.lib.crypto.bcrypt.BCrypt;
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import java.io.Serializable;
+
+@Named
+@SessionScoped
+public class AuthBean implements Serializable {
+
+    @Inject
+    private UserDAO userDAO;
+
+    private User user = new User();
+    private String confirmPassword;
+
+    public String login() {
+        User foundUser = userDAO
+            .getUserByUsername(user.getUsername())
+            .orElse(null);
+        if (
+            foundUser != null &&
+            BCrypt.verifyer()
+                .verify(
+                    user.getPassword().toCharArray(),
+                    foundUser.getPassword()
+                )
+                .verified
+        ) {
+            FacesContext.getCurrentInstance()
+                .getExternalContext()
+                .getSessionMap()
+                .put("user", foundUser);
+            return "todo-list?faces-redirect=true";
+        } else {
+            FacesContext.getCurrentInstance()
+                .addMessage(
+                    null,
+                    new FacesMessage(
+                        FacesMessage.SEVERITY_ERROR,
+                        "Invalid username or password",
+                        null
+                    )
+                );
+            return null;
+        }
+    }
+
+    public String register() {
+        if (!user.getPassword().equals(confirmPassword)) {
+            FacesContext.getCurrentInstance()
+                .addMessage(
+                    null,
+                    new FacesMessage(
+                        FacesMessage.SEVERITY_ERROR,
+                        "Passwords do not match",
+                        null
+                    )
+                );
+            return null;
+        }
+        if (userDAO.usernameExists(user.getUsername())) {
+            FacesContext.getCurrentInstance()
+                .addMessage(
+                    null,
+                    new FacesMessage(
+                        FacesMessage.SEVERITY_ERROR,
+                        "Username already exists",
+                        null
+                    )
+                );
+            return null;
+        }
+        if (userDAO.emailExists(user.getEmail())) {
+            FacesContext.getCurrentInstance()
+                .addMessage(
+                    null,
+                    new FacesMessage(
+                        FacesMessage.SEVERITY_ERROR,
+                        "Email already registered",
+                        null
+                    )
+                );
+            return null;
+        }
+
+        String hashedPassword = BCrypt.withDefaults()
+            .hashToString(12, user.getPassword().toCharArray());
+        user.setPassword(hashedPassword);
+        userDAO.saveUser(user);
+
+        FacesContext.getCurrentInstance()
+            .addMessage(
+                null,
+                new FacesMessage(
+                    FacesMessage.SEVERITY_INFO,
+                    "Registration successful. Please log in.",
+                    null
+                )
+            );
+        return "login?faces-redirect=true";
+    }
+
+    public String logout() {
+        FacesContext.getCurrentInstance()
+            .getExternalContext()
+            .invalidateSession();
+        return "login?faces-redirect=true";
+    }
+
+    // Getter und Setter
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getConfirmPassword() {
+        return confirmPassword;
+    }
+
+    public void setConfirmPassword(String confirmPassword) {
+        this.confirmPassword = confirmPassword;
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/TodoBean.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/TodoBean.java
@ -0,0 +1,112 @@
+package com.todoapp.bean;
+
+import com.todoapp.dao.TodoDAO;
+import com.todoapp.model.Todo;
+import com.todoapp.model.User;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import java.io.Serializable;
+import java.util.List;
+
+@Named
+@SessionScoped
+public class TodoBean implements Serializable {
+
+    @Inject
+    private TodoDAO todoDAO;
+
+    private Todo todo = new Todo();
+    private List<Todo> todos;
+
+    public String saveOrUpdateTodo() {
+        if (todo.getId() == null) {
+            return saveTodo();
+        } else {
+            return updateTodo();
+        }
+    }
+
+    public List<Todo> getTodosByUser(Long userId) {
+        if (todos == null) {
+            todos = todoDAO.getTodosByUser(userId);
+        }
+        return todos;
+    }
+
+    public List<Todo> getTodosByUser() {
+        User user = (User) FacesContext.getCurrentInstance()
+            .getExternalContext()
+            .getSessionMap()
+            .get("user");
+        System.out.println("Fetching todos for user ID: " + user.getId());
+        List<Todo> todos = todoDAO.getTodosByUser(user.getId());
+        System.out.println("Fetched todos: " + todos);
+        return todos;
+    }
+
+    public void loadTodo() {
+        String idParam = FacesContext.getCurrentInstance()
+            .getExternalContext()
+            .getRequestParameterMap()
+            .get("id");
+        if (idParam != null && !idParam.isEmpty()) {
+            Long id = Long.parseLong(idParam);
+            todo = todoDAO.getTodoById(id);
+        } else {
+            todo = new Todo();
+        }
+    }
+
+    public String saveTodo(User user) {
+        todo.setUser(user);
+        todoDAO.saveTodo(todo);
+        todo = new Todo();
+        todos = null;
+        return "todo-list?faces-redirect=true";
+    }
+
+    public String saveTodo() {
+        User user = (User) FacesContext.getCurrentInstance()
+            .getExternalContext()
+            .getSessionMap()
+            .get("user");
+        System.out.println(user);
+        todo.setUser(user);
+        todoDAO.saveTodo(todo);
+        todo = new Todo();
+        todos = null;
+        return "todo-list?faces-redirect=true";
+    }
+
+    public String updateTodo() {
+        todoDAO.updateTodo(todo);
+        todo = new Todo();
+        todos = null;
+        return "todo-list?faces-redirect=true";
+    }
+
+    public String deleteTodo(Long id) {
+        todoDAO.deleteTodo(id);
+        todos = null;
+        return "todo-list?faces-redirect=true";
+    }
+
+    public String completeTodo(Long id) {
+        Todo todoToComplete = todoDAO.getTodoById(id);
+        todoToComplete.setCompleted(!todoToComplete.isCompleted());
+        todoDAO.updateTodo(todoToComplete);
+        todos = null;
+        return "todo-list?faces-redirect=true";
+    }
+
+    // Getter und Setter für 'todo'
+    public Todo getTodo() {
+        return todo;
+    }
+
+    public void setTodo(Todo todo) {
+        this.todo = todo;
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/UserBean.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/UserBean.java
@ -0,0 +1,43 @@
+package com.todoapp.bean;
+
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import jakarta.enterprise.context.SessionScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import java.io.Serializable;
+import java.util.List;
+
+@Named
+@SessionScoped
+public class UserBean implements Serializable {
+
+    @Inject
+    private UserDAO userDAO;
+
+    private User user = new User();
+    private List<User> users;
+
+    public List<User> getAllUsers() {
+        if (users == null) {
+            users = userDAO.getAllUsers();
+        }
+        return users;
+    }
+
+    public String saveUser() {
+        userDAO.saveUser(user);
+        user = new User();
+        users = null; // Reset the list to force a refresh
+        return "user-list?faces-redirect=true";
+    }
+
+    // Getter und Setter für 'user'
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/TodoDAO.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/TodoDAO.java
@ -0,0 +1,134 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.Todo;
+import com.todoapp.util.HibernateUtil;
+import jakarta.enterprise.context.ApplicationScoped;
+import java.util.List;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+
+@ApplicationScoped
+public class TodoDAO {
+
+    public void saveTodo(Todo todo) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            session.persist(todo);
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public void updateTodo(Todo todo) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            session.merge(todo);
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public void deleteTodo(Long id) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            Todo todo = session.get(Todo.class, id);
+            if (todo != null) {
+                session.remove(todo);
+            }
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public Todo getTodoById(Long id) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            return session.get(Todo.class, id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public List<Todo> getAllTodos() {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            return session.createQuery("FROM Todo", Todo.class).list();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of();
+        }
+    }
+
+    public List<Todo> getTodosByUser(Long userId) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<Todo> query = session.createQuery(
+                "FROM Todo t WHERE t.user.id = :userId ORDER BY t.completed, t.targetDate",
+                Todo.class
+            );
+            query.setParameter("userId", userId);
+            return query.list();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of();
+        }
+    }
+
+    public List<Todo> getCompletedTodosByUser(Long userId) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<Todo> query = session.createQuery(
+                "FROM Todo t WHERE t.user.id = :userId AND t.completed = true",
+                Todo.class
+            );
+            query.setParameter("userId", userId);
+            return query.list();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of();
+        }
+    }
+
+    public List<Todo> getIncompleteTodosByUser(Long userId) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<Todo> query = session.createQuery(
+                "FROM Todo t WHERE t.user.id = :userId AND t.completed = false ORDER BY t.targetDate",
+                Todo.class
+            );
+            query.setParameter("userId", userId);
+            return query.list();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of();
+        }
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/UserDAO.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/UserDAO.java
@ -0,0 +1,136 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.User;
+import com.todoapp.util.HibernateUtil;
+import jakarta.enterprise.context.ApplicationScoped;
+import java.util.List;
+import java.util.Optional;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+
+@ApplicationScoped
+public class UserDAO {
+
+    public void saveUser(User user) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            session.persist(user);
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public void updateUser(User user) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            session.merge(user);
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public void deleteUser(Long id) {
+        Transaction transaction = null;
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            transaction = session.beginTransaction();
+            User user = session.get(User.class, id);
+            if (user != null) {
+                session.remove(user);
+            }
+            transaction.commit();
+        } catch (Exception e) {
+            if (transaction != null) {
+                transaction.rollback();
+            }
+            e.printStackTrace();
+        }
+    }
+
+    public User getUserById(Long id) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            return session.get(User.class, id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public Optional<User> getUserByUsername(String username) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<User> query = session.createQuery(
+                "FROM User WHERE username = :username",
+                User.class
+            );
+            query.setParameter("username", username);
+            User user = query.uniqueResult();
+            return Optional.ofNullable(user);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Optional.empty();
+        }
+    }
+
+    public List<User> getAllUsers() {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            return session.createQuery("FROM User", User.class).list();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return List.of();
+        }
+    }
+
+    public boolean usernameExists(String username) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<Long> query = session.createQuery(
+                "SELECT COUNT(u) FROM User u WHERE u.username = :username",
+                Long.class
+            );
+            query.setParameter("username", username);
+            return query.uniqueResult() > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public boolean emailExists(String email) {
+        try (
+            Session session = HibernateUtil.getSessionFactory().openSession()
+        ) {
+            Query<Long> query = session.createQuery(
+                "SELECT COUNT(u) FROM User u WHERE u.email = :email",
+                Long.class
+            );
+            query.setParameter("email", email);
+            return query.uniqueResult() > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/Todo.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/Todo.java
@ -0,0 +1,110 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "todos")
+public class Todo implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String title;
+
+    @Column(length = 1000)
+    private String description;
+
+    @Column(name = "target_date")
+    private LocalDate targetDate;
+
+    private boolean completed;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    // Konstruktoren
+    public Todo() {}
+
+    public Todo(
+        String title,
+        String description,
+        LocalDate targetDate,
+        boolean completed
+    ) {
+        this.title = title;
+        this.description = description;
+        this.targetDate = targetDate;
+        this.completed = completed;
+    }
+
+    // Getter und Setter
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public LocalDate getTargetDate() {
+        return targetDate;
+    }
+
+    public void setTargetDate(LocalDate targetDate) {
+        this.targetDate = targetDate;
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    @Override
+    public String toString() {
+        return (
+            "Todo{" +
+            "id=" +
+            id +
+            ", title='" +
+            title +
+            '\'' +
+            ", targetDate=" +
+            targetDate +
+            ", completed=" +
+            completed +
+            '}'
+        );
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/User.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/User.java
@ -0,0 +1,98 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+public class User implements Serializable {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    @Column(nullable = false, unique = true)
+    private String username;
+    
+    @Column(nullable = false)
+    private String password;
+    
+    @Column(nullable = false)
+    private String email;
+    
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Todo> todos = new ArrayList<>();
+    
+    // Konstruktoren
+    public User() {
+    }
+    
+    public User(String username, String password, String email) {
+        this.username = username;
+        this.password = password;
+        this.email = email;
+    }
+    
+    // Getter und Setter
+    public Long getId() {
+        return id;
+    }
+    
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public String getUsername() {
+        return username;
+    }
+    
+    public void setUsername(String username) {
+        this.username = username;
+    }
+    
+    public String getPassword() {
+        return password;
+    }
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+    public String getEmail() {
+        return email;
+    }
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    
+    public List<Todo> getTodos() {
+        return todos;
+    }
+    
+    public void setTodos(List<Todo> todos) {
+        this.todos = todos;
+    }
+    
+    // Hilfsmethoden
+    public void addTodo(Todo todo) {
+        todos.add(todo);
+        todo.setUser(this);
+    }
+    
+    public void removeTodo(Todo todo) {
+        todos.remove(todo);
+        todo.setUser(null);
+    }
+    
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", username='" + username + '\'' +
+                ", email='" + email + '\'' +
+                '}';
+    }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/AuthFilter.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/AuthFilter.java
@ -0,0 +1,44 @@
+package com.todoapp.util;
+
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import java.io.IOException;
+
+@WebFilter(urlPatterns = { "/todos/*", "/users/*" })
+public class AuthFilter implements Filter {
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+    // Initialisierung
+  }
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+      throws IOException, ServletException {
+    HttpServletRequest httpRequest = (HttpServletRequest) request;
+    HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+    HttpSession session = httpRequest.getSession(false);
+
+    boolean isLoggedIn = (session != null && session.getAttribute("userId") != null);
+    boolean isLoginRequest = httpRequest.getRequestURI().contains("/auth/login");
+    boolean isRegisterRequest = httpRequest.getRequestURI().contains("/auth/register");
+    boolean isResourceRequest = httpRequest.getRequestURI().contains("/css/") ||
+        httpRequest.getRequestURI().contains("/js/");
+
+    if (isLoggedIn || isLoginRequest || isRegisterRequest || isResourceRequest) {
+      chain.doFilter(request, response);
+    } else {
+      httpResponse.sendRedirect(httpRequest.getContextPath() + "/auth/login");
+    }
+  }
+
+  @Override
+  public void destroy() {
+    // Aufräumen
+  }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/HibernateUtil.java
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/HibernateUtil.java
@ -0,0 +1,109 @@
+//package com.todoapp.util;
+//
+//import org.hibernate.SessionFactory;
+//import org.hibernate.boot.Metadata;
+//import org.hibernate.boot.MetadataSources;
+//import org.hibernate.boot.registry.StandardServiceRegistry;
+//import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+//import org.hibernate.cfg.Configuration;
+//
+//public class HibernateUtil {
+//  private static StandardServiceRegistry registry;
+//  private static SessionFactory sessionFactory;
+//
+//  public static SessionFactory getSessionFactory() {
+//    if (sessionFactory == null) {
+//      try {
+//        // Create registry
+//        registry = new StandardServiceRegistryBuilder()
+//            .configure()
+//            .build();
+//
+//        // Create MetadataSources
+//        MetadataSources sources = new MetadataSources(registry);
+//
+//        // Create Metadata
+//        Metadata metadata = sources.getMetadataBuilder().build();
+//
+//        // Create SessionFactory
+//        sessionFactory = metadata.getSessionFactoryBuilder().build();
+//
+//      } catch (Exception e) {
+//        e.printStackTrace();
+//        if (registry != null) {
+//          StandardServiceRegistryBuilder.destroy(registry);
+//        }
+//      }
+//    }
+//    return sessionFactory;
+//  }
+//
+//  public static void shutdown() {
+//    if (registry != null) {
+//      StandardServiceRegistryBuilder.destroy(registry);
+//    }
+//  }
+//}
+
+package com.todoapp.util;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+public class HibernateUtil {
+  private static SessionFactory sessionFactory;
+
+  public static SessionFactory getSessionFactory() {
+    if (sessionFactory == null) {
+      try {
+        Configuration configuration = new Configuration();
+        configuration.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver");
+        configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgresdb:5432/todo_db");
+        configuration.setProperty("hibernate.connection.username", "postgres");
+        configuration.setProperty("hibernate.connection.password", "postgres");
+
+        // Entity-Klassen registrieren
+        configuration.addAnnotatedClass(com.todoapp.model.User.class);
+        configuration.addAnnotatedClass(com.todoapp.model.Todo.class);
+        sessionFactory = configuration.buildSessionFactory();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+    return sessionFactory;
+  }
+
+  // public static SessionFactory getSessionFactory() {
+  // if (sessionFactory == null) {
+  // try {
+  // // Create Configuration
+  // Configuration configuration = new Configuration();
+  //
+  // // Set JNDI DataSource
+  // Context ctx = new InitialContext();
+  // DataSource ds = (DataSource) ctx.lookup("jdbc/PostgresDataSource");
+  // configuration.setProperty("hibernate.connection.datasource",
+  // "jdbc/PostgresDataSource");
+  //
+  // //// Load hibernate.cfg.xml
+  // // configuration.configure("hibernate.cfg.xml");
+  //
+  // // Build SessionFactory
+  // sessionFactory = configuration.buildSessionFactory();
+  //
+  // } catch (Exception e) {
+  // e.printStackTrace();
+  // }
+  // }
+  // return sessionFactory;
+  // }
+
+  public static void shutdown() {
+    if (sessionFactory != null) {
+      sessionFactory.close();
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/liberty/config/server.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/liberty/config/server.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="OpenLiberty Todo App Server">
+
+    <featureManager>
+        <feature>servlet-6.0</feature>
+        <feature>pages-3.1</feature>
+        <feature>jdbc-4.2</feature>
+        <feature>jndi-1.0</feature>
+        <feature>monitor-1.0</feature>
+        <feature>faces-4.0</feature>
+        <feature>websocket-2.1</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint"
+                  httpPort="9080"
+                  httpsPort="9443" />
+
+    <applicationManager autoExpand="true" />
+
+  <dataSource id="PostgresDataSource" jndiName="jdbc/PostgresDataSource">
+    <jdbcDriver libraryRef="PostgresLib" />
+    <properties.postgresql serverName="${POSTGRES_HOST}"
+                          portNumber="${POSTGRES_PORT}"
+                          databaseName="${POSTGRES_DB}"
+                          user="${POSTGRES_USER}"
+                          password="${POSTGRES_PASSWORD}" />
+</dataSource>
+
+
+    <library id="PostgresLib">
+        <fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
+    </library>
+
+</server>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/resources/META-INF/persistence.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/resources/META-INF/persistence.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
+  <persistence-unit name="todoPU" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    <class>com.todoapp.model.User</class>
+    <class>com.todoapp.model.Todo</class>
+    <properties>
+        <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
+        <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgresdb:5432/todo_db"/>
+        <property name="jakarta.persistence.jdbc.user" value="postgres"/>
+        <property name="jakarta.persistence.jdbc.password" value="postgres"/>
+        <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+        <property name="hibernate.hbm2ddl.auto" value="update"/>
+        <property name="hibernate.show_sql" value="true"/>
+    </properties>
+</persistence-unit>
+</persistence>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/resources/hibernate.cfg.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/resources/hibernate.cfg.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+      <session-factory>
+        <!-- JNDI connection settings -->
+        <property name="hibernate.connection.datasource">jdbc/PostgresDataSource</property>
+
+        <!-- Select our SQL dialect -->
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+
+        <!-- Echo the SQL to stdout -->
+        <property name="hibernate.show_sql">true</property>
+
+        <!-- Set the current session context -->
+        <property name="hibernate.current_session_context_class">thread</property>
+
+        <!-- Drop and re-create the database schema on startup -->
+        <property name="hibernate.hbm2ddl.auto">update</property>
+
+        <!-- Entity mapping -->
+        <mapping class="com.todoapp.model.User"/>
+        <mapping class="com.todoapp.model.Todo"/>
+    </session-factory>
+</hibernate-configuration>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/faces-config.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/faces-config.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config
+    xmlns="https://jakarta.ee/xml/ns/jakartaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+    version="4.0">
+</faces-config>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/web.xml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/web.xml
@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
+
+    <display-name>Todo Application</display-name>
+
+    <welcome-file-list>
+        <welcome-file>login.xhtml</welcome-file>
+    </welcome-file-list>
+
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.xhtml</url-pattern>
+    </servlet-mapping>
+
+    <context-param>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+
+    <error-page>
+        <error-code>404</error-code>
+        <location>/error.xhtml</location>
+    </error-page>
+
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.xhtml</location>
+    </error-page>
+
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+
+</web-app>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/error.xhtml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/error.xhtml
@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:f="jakarta.faces.core">
+<h:head>
+    <meta charset="UTF-8"/>
+    <title>Fehler</title>
+    <h:outputStylesheet name="./css/style.css"/>
+</h:head>
+<h:body>
+    <div class="container">
+        <h1>Oops! Es ist ein Fehler aufgetreten</h1>
+
+        <div class="alert alert-danger">
+            <p>Etwas ist schiefgelaufen. Bitte versuchen Sie es später erneut.</p>
+            <p>Fehlercode: #{facesContext.externalContext.responseStatusCode}</p>
+        </div>
+
+        <div class="form-group">
+            <h:link outcome="/todos" value="Zurück zur Startseite" styleClass="btn"/>
+        </div>
+    </div>
+</h:body>
+</html>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/login.xhtml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/login.xhtml
@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:f="jakarta.faces.core">
+<h:head>
+    <meta charset="UTF-8"/>
+    <title>Login</title>
+    <h:outputStylesheet name="./css/style.css"/>
+</h:head>
+<h:body>
+    <div class="container">
+        <h1>Login</h1>
+
+        <h:messages globalOnly="true" styleClass="alert alert-danger"/>
+
+        <h:form>
+            <div class="form-group">
+                <h:outputLabel for="username" value="Benutzername:"/>
+                <h:inputText id="username" value="#{authBean.user.username}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="password" value="Passwort:"/>
+                <h:inputSecret id="password" value="#{authBean.user.password}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:commandButton value="Anmelden" action="#{authBean.login}" styleClass="btn"/>
+            </div>
+        </h:form>
+
+        <p>Noch keinen Account? <h:link outcome="register" value="Registrieren"/></p>
+    </div>
+</h:body>
+</html>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/register.xhtml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/register.xhtml
@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:f="jakarta.faces.core">
+<h:head>
+    <meta charset="UTF-8"/>
+    <title>Registrierung</title>
+    <h:outputStylesheet name="./css/style.css"/>
+</h:head>
+<h:body>
+    <div class="container">
+        <h1>Registrierung</h1>
+
+        <h:messages globalOnly="true" styleClass="alert alert-danger"/>
+
+        <h:form>
+            <div class="form-group">
+                <h:outputLabel for="username" value="Benutzername:"/>
+                <h:inputText id="username" value="#{authBean.user.username}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="email" value="E-Mail:"/>
+                <h:inputText id="email" value="#{authBean.user.email}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="password" value="Passwort:"/>
+                <h:inputSecret id="password" value="#{authBean.user.password}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="confirmPassword" value="Passwort bestätigen:"/>
+                <h:inputSecret id="confirmPassword" value="#{authBean.confirmPassword}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:commandButton value="Registrieren" action="#{authBean.register}" styleClass="btn"/>
+            </div>
+        </h:form>
+
+        <p>Bereits registriert? <h:link outcome="login" value="Anmelden"/></p>
+    </div>
+</h:body>
+</html>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/resources/css/style.css
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/resources/css/style.css
@ -0,0 +1,246 @@
+/* Allgemeine Stile */
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  font-family: Arial, sans-serif;
+  line-height: 1.6;
+  background-color: #f4f4f4;
+  color: #333;
+}
+
+.container {
+  max-width: 900px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+h1 {
+  margin-bottom: 20px;
+  text-align: center;
+  color: #333;
+}
+
+/* Header und Navigation */
+header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+.logout-btn {
+  background-color: #f44336;
+  color: white;
+  padding: 5px 10px;
+  border-radius: 4px;
+  text-decoration: none;
+}
+
+.logout-btn:hover {
+  background-color: #d32f2f;
+}
+
+/* Formulare */
+.form-group {
+  margin-bottom: 15px;
+}
+
+.form-group label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+
+.form-group input,
+.form-group textarea {
+  width: 100%;
+  padding: 8px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+}
+
+.form-group button {
+  background-color: #4caf50;
+  color: white;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 16px;
+}
+
+.form-group button:hover {
+  background-color: #45a049;
+}
+
+/* Alerts */
+.alert {
+  padding: 10px;
+  margin-bottom: 15px;
+  border-radius: 4px;
+}
+
+.alert-danger {
+  background-color: #f8d7da;
+  color: #721c24;
+  border: 1px solid #f5c6cb;
+}
+
+.alert-success {
+  background-color: #d4edda;
+  color: #155724;
+  border: 1px solid #c3e6cb;
+}
+
+/* Links */
+a {
+  color: #007bff;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+/* Buttons */
+.btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.42857143;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  text-decoration: none;
+}
+
+.btn:hover {
+  text-decoration: none;
+}
+
+.add-btn {
+  background-color: #4caf50;
+  color: white;
+}
+
+.add-btn:hover {
+  background-color: #45a049;
+}
+
+.edit-btn {
+  background-color: #2196f3;
+  color: white;
+}
+
+.edit-btn:hover {
+  background-color: #0b7dda;
+}
+
+.delete-btn {
+  background-color: #f44336;
+  color: white;
+}
+
+.delete-btn:hover {
+  background-color: #d32f2f;
+}
+
+.complete-btn {
+  background-color: #ff9800;
+  color: white;
+}
+
+.complete-btn:hover {
+  background-color: #e68a00;
+}
+
+.cancel-btn {
+  background-color: #9e9e9e;
+  color: white;
+}
+
+.cancel-btn:hover {
+  background-color: #7e7e7e;
+}
+
+.save-btn {
+  background-color: #4caf50;
+  color: white;
+}
+
+.save-btn:hover {
+  background-color: #45a049;
+}
+
+/* Todo-Liste */
+.todo-actions {
+  margin-bottom: 20px;
+  text-align: right;
+}
+
+.todo-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 20px;
+}
+
+.todo-table th,
+.todo-table td {
+  padding: 10px;
+  text-align: left;
+  border-bottom: 1px solid #ddd;
+}
+
+.todo-table th {
+  background-color: #f2f2f2;
+}
+
+.todo-table tr:hover {
+  background-color: #f5f5f5;
+}
+
+.todo-table tr.completed {
+  background-color: #f0f0f0;
+  color: #666;
+}
+
+.status {
+  padding: 3px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+
+.status.completed {
+  background-color: #4caf50;
+  color: white;
+}
+
+.status.pending {
+  background-color: #ff9800;
+  color: white;
+}
+
+.no-todos {
+  text-align: center;
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-top: 20px;
+}
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-form.xhtml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-form.xhtml
@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:f="jakarta.faces.core">
+<f:metadata>
+    <f:viewAction action="#{todoBean.loadTodo}" />
+</f:metadata>
+<h:head>
+    <meta charset="UTF-8"/>
+    <title>#{todoBean.todo.id == null ? 'Neue Aufgabe' : 'Aufgabe bearbeiten'}</title>
+    <h:outputStylesheet name="./css/style.css"/>
+</h:head>
+<h:body>
+    <div class="container">
+        <h1>#{todoBean.todo.id == null ? 'Neue Aufgabe' : 'Aufgabe bearbeiten'}</h1>
+
+        <h:form>
+            <h:inputHidden value="#{todoBean.todo.id}"/>
+
+            <div class="form-group">
+                <h:outputLabel for="title" value="Titel:"/>
+                <h:inputText id="title" value="#{todoBean.todo.title}" required="true"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="description" value="Beschreibung:"/>
+                <h:inputTextarea id="description" value="#{todoBean.todo.description}" rows="5"/>
+            </div>
+
+            <div class="form-group">
+                <h:outputLabel for="targetDate" value="Fälligkeitsdatum:"/>
+                <h:inputText id="targetDate" value="#{todoBean.todo.targetDate}" required="false">
+                    <f:convertDateTime type="localDate" pattern="yyyy-MM-dd"/>
+                </h:inputText>
+            </div>
+
+            <div class="form-group">
+                <h:commandButton value="Speichern"
+                    action="#{todoBean.saveOrUpdateTodo}"
+                    styleClass="btn save-btn"/>
+                <h:link outcome="todo-list" value="Abbrechen" styleClass="btn cancel-btn"/>
+            </div>
+        </h:form>
+    </div>
+</h:body>
+</html>
--- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-list.xhtml
+++ b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-list.xhtml
@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:f="jakarta.faces.core"
+      xmlns:ui="jakarta.faces.facelets">
+<h:head>
+    <meta charset="UTF-8"/>
+    <title>Meine Aufgaben</title>
+    <h:outputStylesheet name="./css/style.css"/>
+</h:head>
+<h:body>
+    <div class="container">
+        <header>
+            <h1>Meine Aufgaben</h1>
+            <div class="user-info">
+                <span>Hallo, #{sessionScope.username}!</span>
+                <h:form>
+                    <h:commandLink action="#{authBean.logout}" value="Abmelden" styleClass="logout-btn"/>
+                </h:form>
+            </div>
+        </header>
+
+        <div class="todo-actions">
+            <h:link outcome="todo-form" value="Neue Aufgabe" styleClass="btn add-btn"/>
+        </div>
+
+        <h:panelGroup rendered="#{empty todoBean.todosByUser}">
+            <div class="no-todos">
+                <p>Keine Aufgaben vorhanden. Erstellen Sie eine neue Aufgabe!</p>
+            </div>
+        </h:panelGroup>
+
+        <h:dataTable value="#{todoBean.todosByUser}" var="todo" styleClass="todo-table"
+                     rendered="#{not empty todoBean.todosByUser}">
+            <h:column>
+                <f:facet name="header">Titel</f:facet>
+                #{todo.title}
+            </h:column>
+            <h:column>
+                <f:facet name="header">Beschreibung</f:facet>
+                #{todo.description}
+            </h:column>
+            <h:column>
+                <f:facet name="header">Fälligkeitsdatum</f:facet>
+                <h:outputText value="#{todo.targetDate}">
+                    <f:convertDateTime  type="localDate" pattern="yyyy-MM-dd"/>
+                </h:outputText>
+            </h:column>
+            <h:column>
+                <f:facet name="header">Status</f:facet>
+                <h:outputText value="Erledigt" rendered="#{todo.completed}" styleClass="status completed"/>
+                <h:outputText value="Offen" rendered="#{not todo.completed}" styleClass="status pending"/>
+            </h:column>
+            <h:column>
+                <f:facet name="header">Aktionen</f:facet>
+                <h:link outcome="todo-form" value="Bearbeiten" styleClass="btn edit-btn">
+                    <f:param name="id" value="#{todo.id}"/>
+                </h:link>
+                <h:form>
+                    <h:commandLink action="#{todoBean.deleteTodo(todo.id)}" value="Löschen"
+                                   styleClass="btn delete-btn"
+                                   onclick="return confirm('Möchten Sie diese Aufgabe wirklich löschen?')"/>
+                    <h:commandLink action="#{todoBean.completeTodo(todo.id)}" value="#{todo.completed ? 'Als offen markieren' : 'Als erledigt markieren'}"
+                                   styleClass="btn complete-btn"/>
+                </h:form>
+            </h:column>
+        </h:dataTable>
+    </div>
+</h:body>
+</html>
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.dockerignore
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.dockerignore
@ -0,0 +1,8 @@
+.git
+.github
+.settings
+target
+*.iml
+.idea
+.vscode
+node_modules
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.gitignore
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.gitignore
@ -0,0 +1,27 @@
+# Maven
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# IDE-spezifische Dateien
+.idea/
+*.iws
+*.iml
+*.ipr
+.vscode/
+.settings/
+.classpath
+.project
+.factorypath
+
+# Temporäre Dateien
+*.log
+*.tmp
+*.temp
+
+# Lokale Konfigurationsdateien
+src/main/resources/application-local.properties
+
+# Devcontainer Volumen
+.devcontainer/postgres-data/
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile
@ -0,0 +1,12 @@
+FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
+
+COPY --chown=1001:0 src/main/liberty/config /config
+# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
+RUN mkdir -p /config/lib && \
+    curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar
+
+RUN features.sh
+
+#COPY --chown=1001:0 target/*.war /config/apps
+
+RUN configure.sh
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile.dev
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile.dev
@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+
+#ARG INSTALL_MAVEN="true"
+#ARG MAVEN_VERSION=""
+
+#ARG INSTALL_GRADLE="false"
+#ARG GRADLE_VERSION=""
+
+#RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+#  && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+
+# Hier kannst du zusätzliche Tools oder Bibliotheken installieren, die du für die Entwicklung benötigst.
+# Zum Beispiel den PostgreSQL JDBC-Treiber, wenn du ihn für die Entwicklung benötigst:
+RUN apt-get update && apt-get install -y curl && curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/devcontainer.json
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/devcontainer.json
@ -0,0 +1,14 @@
+{
+  "name": "Java & PostgreSQL",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "forwardPorts": [9080, 5432, 9433],
+  "postCreateCommand": "mvn clean install -DskipTests",
+  "remoteUser": "vscode",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
+    "ghcr.io/devcontainers-extra/features/maven-sdkman:2": {"version": "latest"},
+    "ghcr.io/devcontainers/features/git:1": {"version": "latest"}
+}
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml
@ -0,0 +1,60 @@
+services:
+    app:
+        container_name: javadev
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile.dev
+        volumes:
+            - ../..:/workspaces:cached
+            - ./app:/app
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        networks:
+            - my_network
+        command: sleep infinity
+
+    openliberty:
+        container_name: openliberty_app
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile
+        ports:
+            - "9080:9080"
+            - "9443:9443"
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: todo_db
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        volumes:
+            - ./app:/config/dropins
+        depends_on:
+            - db
+        networks:
+            - my_network
+
+    db:
+        container_name: postgresdb
+        image: postgres:latest
+        restart: unless-stopped
+        volumes:
+            - postgres-data:/var/lib/postgresql/data
+            - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+        environment:
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_DB: todo_db
+        networks:
+            - my_network
+
+volumes:
+    postgres-data:
+
+networks:
+    my_network:
+        driver: bridge
--- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql
+++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql
@ -0,0 +1,17 @@
+CREATE TABLE users (
+    id SERIAL PRIMARY KEY,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(255) NOT NULL,
+    email VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE todos (
+    id SERIAL PRIMARY KEY,
+    title VARCHAR(255) NOT NULL,
+    description VARCHAR(1000),
+    target_date DATE,
+    completed BOOLEAN,
+    user_id BIGINT NOT NULL,
+    FOREIGN KEY (user_id) REFERENCES users(id)
+);
+
--- a/cmd/jws/projects/jakarta-jsp-todo/pom.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/pom.xml
@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.todoapp</groupId>
+    <artifactId>todo-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <hibernate.version>6.6.22.Final</hibernate.version>
+        <postgresql.version>42.7.6</postgresql.version>
+    </properties>
+
+    <dependencies>
+        <!-- Jakarta EE 10 API -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakartaee.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Hibernate Core -->
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+
+        <!-- PostgreSQL JDBC Driver -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+        </dependency>
+
+        <!-- JSTL -->
+        <dependency>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+<dependency>
+    <groupId>org.hibernate.orm</groupId>
+    <artifactId>hibernate-core</artifactId>
+    <version>7.0.0.Final</version>  <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
+</dependency>
+        <!-- Mindestens zum Passwort-Hashing -->
+        <dependency>
+            <groupId>at.favre.lib</groupId>
+            <artifactId>bcrypt</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>todo-app</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+            </plugin>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>3.11.4</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/cmd/jws/projects/jakarta-jsp-todo/server.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/server.xml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="OpenLiberty Todo App Server">
+
+    <featureManager>
+        <feature>servlet-6.0</feature>
+        <feature>pages-3.1</feature>
+        <feature>jdbc-4.2</feature>
+        <feature>jndi-1.0</feature>
+        <feature>monitor-1.0</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint"
+                  httpPort="9080"
+                  httpsPort="9443" />
+
+    <applicationManager autoExpand="true" />
+
+    <dataSource id="PostgresDataSource">
+        <jdbcDriver libraryRef="PostgresLib" />
+        <properties.postgresql serverName="postgres"
+                              portNumber="5432"
+                              databaseName="todo_db"
+                              user="postgres"
+                              password="postgres" />
+    </dataSource>
+
+    <library id="PostgresLib">
+        <fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
+    </library>
+
+    <webApplication location="todo-app.war" contextRoot="/todo-app" />
+
+</server>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/TodoDAO.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/TodoDAO.java
@ -0,0 +1,111 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.Todo;
+import com.todoapp.util.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+
+import java.util.List;
+
+public class TodoDAO {
+
+  public void saveTodo(Todo todo) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      session.persist(todo);
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public void updateTodo(Todo todo) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      session.merge(todo);
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public void deleteTodo(Long id) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      Todo todo = session.get(Todo.class, id);
+      if (todo != null) {
+        session.remove(todo);
+      }
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public Todo getTodoById(Long id) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      return session.get(Todo.class, id);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  public List<Todo> getAllTodos() {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      return session.createQuery("FROM Todo", Todo.class).list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return List.of();
+    }
+  }
+
+  public List<Todo> getTodosByUser(Long userId) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.id = :userId ORDER BY t.completed, t.targetDate", Todo.class);
+      query.setParameter("userId", userId);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return List.of();
+    }
+  }
+
+  public List<Todo> getCompletedTodosByUser(Long userId) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.id = :userId AND t.completed = true", Todo.class);
+      query.setParameter("userId", userId);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return List.of();
+    }
+  }
+
+  public List<Todo> getIncompleteTodosByUser(Long userId) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.id = :userId AND t.completed = false ORDER BY t.targetDate", Todo.class);
+      query.setParameter("userId", userId);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return List.of();
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/UserDAO.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/UserDAO.java
@ -0,0 +1,112 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.User;
+import com.todoapp.util.HibernateUtil;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+
+import java.util.List;
+import java.util.Optional;
+
+public class UserDAO {
+
+  public void saveUser(User user) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      session.persist(user);
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public void updateUser(User user) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      session.merge(user);
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public void deleteUser(Long id) {
+    Transaction transaction = null;
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      transaction = session.beginTransaction();
+      User user = session.get(User.class, id);
+      if (user != null) {
+        session.remove(user);
+      }
+      transaction.commit();
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+    }
+  }
+
+  public User getUserById(Long id) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      return session.get(User.class, id);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  public Optional<User> getUserByUsername(String username) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<User> query = session.createQuery("FROM User WHERE username = :username", User.class);
+      query.setParameter("username", username);
+      User user = query.uniqueResult();
+      return Optional.ofNullable(user);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return Optional.empty();
+    }
+  }
+
+  public List<User> getAllUsers() {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      return session.createQuery("FROM User", User.class).list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return List.of();
+    }
+  }
+
+  public boolean usernameExists(String username) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<Long> query = session.createQuery(
+          "SELECT COUNT(u) FROM User u WHERE u.username = :username", Long.class);
+      query.setParameter("username", username);
+      return query.uniqueResult() > 0;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+
+  public boolean emailExists(String email) {
+    try (Session session = HibernateUtil.getSessionFactory().openSession()) {
+      Query<Long> query = session.createQuery(
+          "SELECT COUNT(u) FROM User u WHERE u.email = :email", Long.class);
+      query.setParameter("email", email);
+      return query.uniqueResult() > 0;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return false;
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/Todo.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/Todo.java
@ -0,0 +1,99 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "todos")
+public class Todo implements Serializable {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @Column(nullable = false)
+  private String title;
+
+  @Column(length = 1000)
+  private String description;
+
+  @Column(name = "target_date")
+  private LocalDate targetDate;
+
+  private boolean completed;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "user_id", nullable = false)
+  private User user;
+
+  // Konstruktoren
+  public Todo() {
+  }
+
+  public Todo(String title, String description, LocalDate targetDate, boolean completed) {
+    this.title = title;
+    this.description = description;
+    this.targetDate = targetDate;
+    this.completed = completed;
+  }
+
+  // Getter und Setter
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public LocalDate getTargetDate() {
+    return targetDate;
+  }
+
+  public void setTargetDate(LocalDate targetDate) {
+    this.targetDate = targetDate;
+  }
+
+  public boolean isCompleted() {
+    return completed;
+  }
+
+  public void setCompleted(boolean completed) {
+    this.completed = completed;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+
+  @Override
+  public String toString() {
+    return "Todo{" +
+        "id=" + id +
+        ", title='" + title + '\'' +
+        ", targetDate=" + targetDate +
+        ", completed=" + completed +
+        '}';
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/User.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/User.java
@ -0,0 +1,98 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+public class User implements Serializable {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    
+    @Column(nullable = false, unique = true)
+    private String username;
+    
+    @Column(nullable = false)
+    private String password;
+    
+    @Column(nullable = false)
+    private String email;
+    
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Todo> todos = new ArrayList<>();
+    
+    // Konstruktoren
+    public User() {
+    }
+    
+    public User(String username, String password, String email) {
+        this.username = username;
+        this.password = password;
+        this.email = email;
+    }
+    
+    // Getter und Setter
+    public Long getId() {
+        return id;
+    }
+    
+    public void setId(Long id) {
+        this.id = id;
+    }
+    
+    public String getUsername() {
+        return username;
+    }
+    
+    public void setUsername(String username) {
+        this.username = username;
+    }
+    
+    public String getPassword() {
+        return password;
+    }
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+    public String getEmail() {
+        return email;
+    }
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    
+    public List<Todo> getTodos() {
+        return todos;
+    }
+    
+    public void setTodos(List<Todo> todos) {
+        this.todos = todos;
+    }
+    
+    // Hilfsmethoden
+    public void addTodo(Todo todo) {
+        todos.add(todo);
+        todo.setUser(this);
+    }
+    
+    public void removeTodo(Todo todo) {
+        todos.remove(todo);
+        todo.setUser(null);
+    }
+    
+    @Override
+    public String toString() {
+        return "User{" +
+                "id=" + id +
+                ", username='" + username + '\'' +
+                ", email='" + email + '\'' +
+                '}';
+    }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/AuthServlet.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/AuthServlet.java
@ -0,0 +1,154 @@
+package com.todoapp.servlet;
+
+import at.favre.lib.crypto.bcrypt.BCrypt;
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import java.io.IOException;
+import java.util.Optional;
+
+@WebServlet("/auth/*")
+public class AuthServlet extends HttpServlet {
+
+  private final UserDAO userDAO = new UserDAO();
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    String action = request.getPathInfo();
+
+    if (action == null) {
+      action = "";
+    }
+
+    switch (action) {
+      case "/register":
+        showRegisterForm(request, response);
+        break;
+      case "/logout":
+        logout(request, response);
+        break;
+      default:
+        showLoginForm(request, response);
+        break;
+    }
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    String action = request.getPathInfo();
+
+    if (action == null) {
+      action = "";
+    }
+
+    switch (action) {
+      case "/register":
+        registerUser(request, response);
+        break;
+      case "/login":
+        loginUser(request, response);
+        break;
+      default:
+        response.sendRedirect(request.getContextPath() + "/auth/login");
+        break;
+    }
+  }
+
+  private void showLoginForm(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    request.getRequestDispatcher("/login.jsp").forward(request, response);
+  }
+
+  private void showRegisterForm(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    request.getRequestDispatcher("/register.jsp").forward(request, response);
+  }
+
+  private void registerUser(HttpServletRequest request, HttpServletResponse response)
+      throws IOException, ServletException {
+    String username = request.getParameter("username");
+    String password = request.getParameter("password");
+    String confirmPassword = request.getParameter("confirmPassword");
+    String email = request.getParameter("email");
+
+    if (username == null || password == null || email == null || username.trim().isEmpty() || password.trim().isEmpty()
+        || email.trim().isEmpty()) {
+      request.setAttribute("errorMessage", "Alle Felder müssen ausgefüllt werden");
+      request.getRequestDispatcher("/register.jsp").forward(request, response);
+      return;
+    }
+
+    if (!password.equals(confirmPassword)) {
+      request.setAttribute("errorMessage", "Passwörter stimmen nicht überein");
+      request.getRequestDispatcher("/register.jsp").forward(request, response);
+      return;
+    }
+
+    if (userDAO.usernameExists(username)) {
+      request.setAttribute("errorMessage", "Benutzername ist bereits vergeben");
+      request.getRequestDispatcher("/register.jsp").forward(request, response);
+      return;
+    }
+
+    if (userDAO.emailExists(email)) {
+      request.setAttribute("errorMessage", "E-Mail-Adresse ist bereits registriert");
+      request.getRequestDispatcher("/register.jsp").forward(request, response);
+      return;
+    }
+
+    // Hash password
+    String hashedPassword = BCrypt.withDefaults().hashToString(12, password.toCharArray());
+
+    User user = new User(username, hashedPassword, email);
+    userDAO.saveUser(user);
+
+    request.setAttribute("successMessage", "Registrierung erfolgreich. Bitte melden Sie sich an.");
+    request.getRequestDispatcher("/login.jsp").forward(request, response);
+  }
+
+  private void loginUser(HttpServletRequest request, HttpServletResponse response)
+      throws IOException, ServletException {
+    String username = request.getParameter("username");
+    String password = request.getParameter("password");
+
+    if (username == null || password == null || username.trim().isEmpty() || password.trim().isEmpty()) {
+      request.setAttribute("errorMessage", "Benutzername und Passwort sind erforderlich");
+      request.getRequestDispatcher("/login.jsp").forward(request, response);
+      return;
+    }
+
+    Optional<User> optionalUser = userDAO.getUserByUsername(username);
+
+    if (optionalUser.isPresent()) {
+      User user = optionalUser.get();
+      BCrypt.Result result = BCrypt.verifyer().verify(password.toCharArray(), user.getPassword());
+
+      if (result.verified) {
+        HttpSession session = request.getSession();
+        session.setAttribute("user", user);
+        session.setAttribute("userId", user.getId());
+        session.setAttribute("username", user.getUsername());
+
+        response.sendRedirect(request.getContextPath() + "/todos");
+        return;
+      }
+    }
+
+    request.setAttribute("errorMessage", "Ungültiger Benutzername oder Passwort");
+    request.getRequestDispatcher("/login.jsp").forward(request, response);
+  }
+
+  private void logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    HttpSession session = request.getSession(false);
+    if (session != null) {
+      session.invalidate();
+    }
+    response.sendRedirect(request.getContextPath() + "/auth/login");
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/TodoServlet.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/TodoServlet.java
@ -0,0 +1,182 @@
+package com.todoapp.servlet;
+
+import com.todoapp.dao.TodoDAO;
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.Todo;
+import com.todoapp.model.User;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
+
+@WebServlet("/todos/*")
+public class TodoServlet extends HttpServlet {
+
+  private final TodoDAO todoDAO = new TodoDAO();
+  private final UserDAO userDAO = new UserDAO();
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    HttpSession session = request.getSession(false);
+    if (session == null || session.getAttribute("userId") == null) {
+      response.sendRedirect(request.getContextPath() + "/auth/login");
+      return;
+    }
+
+    String action = request.getPathInfo();
+
+    if (action == null) {
+      action = "/list";
+    }
+
+    switch (action) {
+      case "/new":
+        showNewForm(request, response);
+        break;
+      case "/edit":
+        showEditForm(request, response);
+        break;
+      case "/delete":
+        deleteTodo(request, response);
+        break;
+      case "/complete":
+        completeTodo(request, response);
+        break;
+      default:
+        listTodos(request, response);
+        break;
+    }
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    HttpSession session = request.getSession(false);
+    if (session == null || session.getAttribute("userId") == null) {
+      response.sendRedirect(request.getContextPath() + "/auth/login");
+      return;
+    }
+
+    String action = request.getPathInfo();
+
+    if (action == null) {
+      action = "/insert";
+    }
+
+    switch (action) {
+      case "/insert":
+        insertTodo(request, response);
+        break;
+      case "/update":
+        updateTodo(request, response);
+        break;
+      default:
+        response.sendRedirect(request.getContextPath() + "/todos");
+        break;
+    }
+  }
+
+  private void listTodos(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    List<Todo> todos = todoDAO.getTodosByUser(userId);
+    request.setAttribute("todos", todos);
+    request.getRequestDispatcher("/todo-list.jsp").forward(request, response);
+  }
+
+  private void showNewForm(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    request.getRequestDispatcher("/todo-form.jsp").forward(request, response);
+  }
+
+  private void showEditForm(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    Long todoId = Long.parseLong(request.getParameter("id"));
+
+    Todo todo = todoDAO.getTodoById(todoId);
+
+    if (todo == null || !todo.getUser().getId().equals(userId)) {
+      response.sendRedirect(request.getContextPath() + "/todos");
+      return;
+    }
+
+    request.setAttribute("todo", todo);
+    request.getRequestDispatcher("/todo-form.jsp").forward(request, response);
+  }
+
+  private void insertTodo(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    User user = userDAO.getUserById(userId);
+
+    if (user == null) {
+      response.sendRedirect(request.getContextPath() + "/auth/login");
+      return;
+    }
+
+    String title = request.getParameter("title");
+    String description = request.getParameter("description");
+    LocalDate targetDate = LocalDate.parse(request.getParameter("targetDate"));
+
+    Todo todo = new Todo(title, description, targetDate, false);
+    todo.setUser(user);
+
+    todoDAO.saveTodo(todo);
+    response.sendRedirect(request.getContextPath() + "/todos");
+  }
+
+  private void updateTodo(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    Long todoId = Long.parseLong(request.getParameter("id"));
+
+    Todo todo = todoDAO.getTodoById(todoId);
+
+    if (todo == null || !todo.getUser().getId().equals(userId)) {
+      response.sendRedirect(request.getContextPath() + "/todos");
+      return;
+    }
+
+    String title = request.getParameter("title");
+    String description = request.getParameter("description");
+    LocalDate targetDate = LocalDate.parse(request.getParameter("targetDate"));
+
+    todo.setTitle(title);
+    todo.setDescription(description);
+    todo.setTargetDate(targetDate);
+
+    todoDAO.updateTodo(todo);
+    response.sendRedirect(request.getContextPath() + "/todos");
+  }
+
+  private void deleteTodo(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    Long todoId = Long.parseLong(request.getParameter("id"));
+
+    Todo todo = todoDAO.getTodoById(todoId);
+
+    if (todo != null && todo.getUser().getId().equals(userId)) {
+      todoDAO.deleteTodo(todoId);
+    }
+
+    response.sendRedirect(request.getContextPath() + "/todos");
+  }
+
+  private void completeTodo(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    Long userId = (Long) request.getSession().getAttribute("userId");
+    Long todoId = Long.parseLong(request.getParameter("id"));
+
+    Todo todo = todoDAO.getTodoById(todoId);
+
+    if (todo != null && todo.getUser().getId().equals(userId)) {
+      todo.setCompleted(!todo.isCompleted());
+      todoDAO.updateTodo(todo);
+    }
+
+    response.sendRedirect(request.getContextPath() + "/todos");
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/UserServlet.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/UserServlet.java
@ -0,0 +1,73 @@
+package com.todoapp.servlet;
+
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
+@WebServlet("/users")
+public class UserServlet extends HttpServlet {
+  private final UserDAO userDAO = new UserDAO();
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    String idParam = request.getParameter("id");
+    if (idParam != null) {
+      Long id = Long.parseLong(idParam);
+      User user = userDAO.getUserById(id);
+      request.setAttribute("user", user);
+    } else {
+      List<User> users = userDAO.getAllUsers();
+      request.setAttribute("users", users);
+    }
+    request.getRequestDispatcher("/user-list.jsp").forward(request, response);
+  }
+
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    String username = request.getParameter("username");
+    String password = request.getParameter("password");
+    String email = request.getParameter("email");
+
+    if (username == null || password == null || email == null || userDAO.usernameExists(username)) {
+      response.sendRedirect("error.jsp?message=Invalid%20input%20or%20username%20exists");
+      return;
+    }
+    User user = new User(username, password, email);
+    userDAO.saveUser(user);
+    response.sendRedirect("users");
+  }
+
+  @Override
+  protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+    Long id = Long.parseLong(request.getParameter("id"));
+    String username = request.getParameter("username");
+    String password = request.getParameter("password");
+    String email = request.getParameter("email");
+
+    Optional<User> userOptional = userDAO.getUserByUsername(username);
+    if (userOptional.isPresent() && !userOptional.get().getId().equals(id)) {
+      response.sendRedirect("error.jsp?message=Username%20already%20exists");
+      return;
+    }
+    User user = new User(username, password, email);
+    user.setId(id);
+    userDAO.updateUser(user);
+    response.sendRedirect("users");
+  }
+
+  @Override
+  protected void doDelete(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    Long id = Long.parseLong(request.getParameter("id"));
+    userDAO.deleteUser(id);
+    response.sendRedirect("users");
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/AuthFilter.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/AuthFilter.java
@ -0,0 +1,44 @@
+package com.todoapp.util;
+
+import jakarta.servlet.*;
+import jakarta.servlet.annotation.WebFilter;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import java.io.IOException;
+
+@WebFilter(urlPatterns = { "/todos/*", "/users/*" })
+public class AuthFilter implements Filter {
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+    // Initialisierung
+  }
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+      throws IOException, ServletException {
+    HttpServletRequest httpRequest = (HttpServletRequest) request;
+    HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+    HttpSession session = httpRequest.getSession(false);
+
+    boolean isLoggedIn = (session != null && session.getAttribute("userId") != null);
+    boolean isLoginRequest = httpRequest.getRequestURI().contains("/auth/login");
+    boolean isRegisterRequest = httpRequest.getRequestURI().contains("/auth/register");
+    boolean isResourceRequest = httpRequest.getRequestURI().contains("/css/") ||
+        httpRequest.getRequestURI().contains("/js/");
+
+    if (isLoggedIn || isLoginRequest || isRegisterRequest || isResourceRequest) {
+      chain.doFilter(request, response);
+    } else {
+      httpResponse.sendRedirect(httpRequest.getContextPath() + "/auth/login");
+    }
+  }
+
+  @Override
+  public void destroy() {
+    // Aufräumen
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java
@ -0,0 +1,109 @@
+//package com.todoapp.util;
+//
+//import org.hibernate.SessionFactory;
+//import org.hibernate.boot.Metadata;
+//import org.hibernate.boot.MetadataSources;
+//import org.hibernate.boot.registry.StandardServiceRegistry;
+//import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+//import org.hibernate.cfg.Configuration;
+//
+//public class HibernateUtil {
+//  private static StandardServiceRegistry registry;
+//  private static SessionFactory sessionFactory;
+//
+//  public static SessionFactory getSessionFactory() {
+//    if (sessionFactory == null) {
+//      try {
+//        // Create registry
+//        registry = new StandardServiceRegistryBuilder()
+//            .configure()
+//            .build();
+//
+//        // Create MetadataSources
+//        MetadataSources sources = new MetadataSources(registry);
+//
+//        // Create Metadata
+//        Metadata metadata = sources.getMetadataBuilder().build();
+//
+//        // Create SessionFactory
+//        sessionFactory = metadata.getSessionFactoryBuilder().build();
+//
+//      } catch (Exception e) {
+//        e.printStackTrace();
+//        if (registry != null) {
+//          StandardServiceRegistryBuilder.destroy(registry);
+//        }
+//      }
+//    }
+//    return sessionFactory;
+//  }
+//
+//  public static void shutdown() {
+//    if (registry != null) {
+//      StandardServiceRegistryBuilder.destroy(registry);
+//    }
+//  }
+//}
+
+package com.todoapp.util;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+public class HibernateUtil {
+  private static SessionFactory sessionFactory;
+
+  public static SessionFactory getSessionFactory() {
+    if (sessionFactory == null) {
+      try {
+        Configuration configuration = new Configuration();
+        configuration.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver");
+        configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgresdb:5432/todo_db");
+        configuration.setProperty("hibernate.connection.username", "postgres");
+        configuration.setProperty("hibernate.connection.password", "postgres");
+
+        // Entity-Klassen registrieren
+        configuration.addAnnotatedClass(com.todoapp.model.User.class);
+        configuration.addAnnotatedClass(com.todoapp.model.Todo.class);
+        sessionFactory = configuration.buildSessionFactory();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+    return sessionFactory;
+  }
+
+  // public static SessionFactory getSessionFactory() {
+  // if (sessionFactory == null) {
+  // try {
+  // // Create Configuration
+  // Configuration configuration = new Configuration();
+  //
+  // // Set JNDI DataSource
+  // Context ctx = new InitialContext();
+  // DataSource ds = (DataSource) ctx.lookup("jdbc/PostgresDataSource");
+  // configuration.setProperty("hibernate.connection.datasource",
+  // "jdbc/PostgresDataSource");
+  //
+  // //// Load hibernate.cfg.xml
+  // // configuration.configure("hibernate.cfg.xml");
+  //
+  // // Build SessionFactory
+  // sessionFactory = configuration.buildSessionFactory();
+  //
+  // } catch (Exception e) {
+  // e.printStackTrace();
+  // }
+  // }
+  // return sessionFactory;
+  // }
+
+  public static void shutdown() {
+    if (sessionFactory != null) {
+      sessionFactory.close();
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/liberty/config/server.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/liberty/config/server.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="OpenLiberty Todo App Server">
+
+    <featureManager>
+        <feature>servlet-6.0</feature>
+        <feature>pages-3.1</feature>
+        <feature>jdbc-4.2</feature>
+        <feature>jndi-1.0</feature>
+        <feature>monitor-1.0</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint"
+                  httpPort="9080"
+                  httpsPort="9443" />
+
+    <applicationManager autoExpand="true" />
+
+  <dataSource id="PostgresDataSource" jndiName="jdbc/PostgresDataSource">
+    <jdbcDriver libraryRef="PostgresLib" />
+    <properties.postgresql serverName="${POSTGRES_HOST}"
+                          portNumber="${POSTGRES_PORT}"
+                          databaseName="${POSTGRES_DB}"
+                          user="${POSTGRES_USER}"
+                          password="${POSTGRES_PASSWORD}" />
+</dataSource>
+
+
+    <library id="PostgresLib">
+        <fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
+    </library>
+
+    <webApplication location="todo-app.war" contextRoot="/todo-app" />
+
+</server>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
+  <persistence-unit name="todoPU" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    <class>com.todoapp.model.User</class>
+    <class>com.todoapp.model.Todo</class>
+    <properties>
+        <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
+        <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgresdb:5432/todo_db"/>
+        <property name="jakarta.persistence.jdbc.user" value="postgres"/>
+        <property name="jakarta.persistence.jdbc.password" value="postgres"/>
+        <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+        <property name="hibernate.hbm2ddl.auto" value="update"/>
+        <property name="hibernate.show_sql" value="true"/>
+    </properties>
+</persistence-unit>
+</persistence>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/hibernate.cfg.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/hibernate.cfg.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+      <session-factory>
+        <!-- JNDI connection settings -->
+        <property name="hibernate.connection.datasource">jdbc/PostgresDataSource</property>
+
+        <!-- Select our SQL dialect -->
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+
+        <!-- Echo the SQL to stdout -->
+        <property name="hibernate.show_sql">true</property>
+
+        <!-- Set the current session context -->
+        <property name="hibernate.current_session_context_class">thread</property>
+
+        <!-- Drop and re-create the database schema on startup -->
+        <property name="hibernate.hbm2ddl.auto">update</property>
+
+        <!-- Entity mapping -->
+        <mapping class="com.todoapp.model.User"/>
+        <mapping class="com.todoapp.model.Todo"/>
+    </session-factory>
+</hibernate-configuration>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/WEB-INF/web.xml
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/WEB-INF/web.xml
@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
+
+    <display-name>Todo Application</display-name>
+
+    <welcome-file-list>
+        <welcome-file>auth/login</welcome-file>
+    </welcome-file-list>
+
+    <error-page>
+        <error-code>404</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+
+    <error-page>
+        <error-code>500</error-code>
+        <location>/error.jsp</location>
+    </error-page>
+
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+
+</web-app>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/css/style.css
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/css/style.css
@ -0,0 +1,246 @@
+/* Allgemeine Stile */
+* {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+}
+
+body {
+  font-family: Arial, sans-serif;
+  line-height: 1.6;
+  background-color: #f4f4f4;
+  color: #333;
+}
+
+.container {
+  max-width: 900px;
+  margin: 0 auto;
+  padding: 20px;
+}
+
+h1 {
+  margin-bottom: 20px;
+  text-align: center;
+  color: #333;
+}
+
+/* Header und Navigation */
+header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #ddd;
+}
+
+.user-info {
+  display: flex;
+  align-items: center;
+  gap: 20px;
+}
+
+.logout-btn {
+  background-color: #f44336;
+  color: white;
+  padding: 5px 10px;
+  border-radius: 4px;
+  text-decoration: none;
+}
+
+.logout-btn:hover {
+  background-color: #d32f2f;
+}
+
+/* Formulare */
+.form-group {
+  margin-bottom: 15px;
+}
+
+.form-group label {
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+
+.form-group input,
+.form-group textarea {
+  width: 100%;
+  padding: 8px;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+}
+
+.form-group button {
+  background-color: #4caf50;
+  color: white;
+  padding: 10px 15px;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 16px;
+}
+
+.form-group button:hover {
+  background-color: #45a049;
+}
+
+/* Alerts */
+.alert {
+  padding: 10px;
+  margin-bottom: 15px;
+  border-radius: 4px;
+}
+
+.alert-danger {
+  background-color: #f8d7da;
+  color: #721c24;
+  border: 1px solid #f5c6cb;
+}
+
+.alert-success {
+  background-color: #d4edda;
+  color: #155724;
+  border: 1px solid #c3e6cb;
+}
+
+/* Links */
+a {
+  color: #007bff;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+/* Buttons */
+.btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.42857143;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  cursor: pointer;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  text-decoration: none;
+}
+
+.btn:hover {
+  text-decoration: none;
+}
+
+.add-btn {
+  background-color: #4caf50;
+  color: white;
+}
+
+.add-btn:hover {
+  background-color: #45a049;
+}
+
+.edit-btn {
+  background-color: #2196f3;
+  color: white;
+}
+
+.edit-btn:hover {
+  background-color: #0b7dda;
+}
+
+.delete-btn {
+  background-color: #f44336;
+  color: white;
+}
+
+.delete-btn:hover {
+  background-color: #d32f2f;
+}
+
+.complete-btn {
+  background-color: #ff9800;
+  color: white;
+}
+
+.complete-btn:hover {
+  background-color: #e68a00;
+}
+
+.cancel-btn {
+  background-color: #9e9e9e;
+  color: white;
+}
+
+.cancel-btn:hover {
+  background-color: #7e7e7e;
+}
+
+.save-btn {
+  background-color: #4caf50;
+  color: white;
+}
+
+.save-btn:hover {
+  background-color: #45a049;
+}
+
+/* Todo-Liste */
+.todo-actions {
+  margin-bottom: 20px;
+  text-align: right;
+}
+
+.todo-table {
+  width: 100%;
+  border-collapse: collapse;
+  margin-bottom: 20px;
+}
+
+.todo-table th,
+.todo-table td {
+  padding: 10px;
+  text-align: left;
+  border-bottom: 1px solid #ddd;
+}
+
+.todo-table th {
+  background-color: #f2f2f2;
+}
+
+.todo-table tr:hover {
+  background-color: #f5f5f5;
+}
+
+.todo-table tr.completed {
+  background-color: #f0f0f0;
+  color: #666;
+}
+
+.status {
+  padding: 3px 8px;
+  border-radius: 12px;
+  font-size: 12px;
+}
+
+.status.completed {
+  background-color: #4caf50;
+  color: white;
+}
+
+.status.pending {
+  background-color: #ff9800;
+  color: white;
+}
+
+.no-todos {
+  text-align: center;
+  padding: 20px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  margin-top: 20px;
+}
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/error.jsp
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/error.jsp
@ -0,0 +1,23 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isErrorPage="true" %>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Fehler</title>
+    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
+</head>
+<body>
+    <div class="container">
+        <h1>Oops! Es ist ein Fehler aufgetreten</h1>
+        
+        <div class="alert alert-danger">
+            <p>Etwas ist schiefgelaufen. Bitte versuchen Sie es später erneut.</p>
+            <p>Fehlercode: ${pageContext.errorData.statusCode}</p>
+        </div>
+        
+        <div class="form-group">
+            <a href="${pageContext.request.contextPath}/todos" class="btn">Zurück zur Startseite</a>
+        </div>
+    </div>
+</body>
+</html>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/login.jsp
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/login.jsp
@ -0,0 +1,45 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Login</title>
+    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
+</head>
+<body>
+    <div class="container">
+        <h1>Login</h1>
+        
+        <c:if test="${not empty errorMessage}">
+            <div class="alert alert-danger">
+                <p>${errorMessage}</p>
+            </div>
+        </c:if>
+        
+        <c:if test="${not empty successMessage}">
+            <div class="alert alert-success">
+                <p>${successMessage}</p>
+            </div>
+        </c:if>
+        
+        <form action="${pageContext.request.contextPath}/auth/login" method="post">
+            <div class="form-group">
+                <label for="username">Benutzername:</label>
+                <input type="text" id="username" name="username" required>
+            </div>
+            
+            <div class="form-group">
+                <label for="password">Passwort:</label>
+                <input type="password" id="password" name="password" required>
+            </div>
+            
+            <div class="form-group">
+                <button type="submit">Anmelden</button>
+            </div>
+        </form>
+        
+        <p>Noch keinen Account? <a href="${pageContext.request.contextPath}/auth/register">Registrieren</a></p>
+    </div>
+</body>
+</html>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/register.jsp
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/register.jsp
@ -0,0 +1,49 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Registrierung</title>
+    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
+</head>
+<body>
+    <div class="container">
+        <h1>Registrierung</h1>
+        
+        <c:if test="${not empty errorMessage}">
+            <div class="alert alert-danger">
+                <p>${errorMessage}</p>
+            </div>
+        </c:if>
+        
+        <form action="${pageContext.request.contextPath}/auth/register" method="post">
+            <div class="form-group">
+                <label for="username">Benutzername:</label>
+                <input type="text" id="username" name="username" required>
+            </div>
+            
+            <div class="form-group">
+                <label for="email">E-Mail:</label>
+                <input type="email" id="email" name="email" required>
+            </div>
+            
+            <div class="form-group">
+                <label for="password">Passwort:</label>
+                <input type="password" id="password" name="password" required>
+            </div>
+            
+            <div class="form-group">
+                <label for="confirmPassword">Passwort bestätigen:</label>
+                <input type="password" id="confirmPassword" name="confirmPassword" required>
+            </div>
+            
+            <div class="form-group">
+                <button type="submit">Registrieren</button>
+            </div>
+        </form>
+        
+        <p>Bereits registriert? <a href="${pageContext.request.contextPath}/auth/login">Anmelden</a></p>
+    </div>
+</body>
+</html>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-form.jsp
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-form.jsp
@ -0,0 +1,41 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>${todo != null ? 'Aufgabe bearbeiten' : 'Neue Aufgabe'}</title>
+    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
+</head>
+<body>
+    <div class="container">
+        <h1>${todo != null ? 'Aufgabe bearbeiten' : 'Neue Aufgabe'}</h1>
+        
+        <form action="${pageContext.request.contextPath}${todo != null ? '/todos/update' : '/todos/insert'}" method="post">
+            <c:if test="${todo != null}">
+                <input type="hidden" name="id" value="${todo.id}">
+            </c:if>
+            
+            <div class="form-group">
+                <label for="title">Titel:</label>
+                <input type="text" id="title" name="title" value="${todo != null ? todo.title : ''}" required>
+            </div>
+            
+            <div class="form-group">
+                <label for="description">Beschreibung:</label>
+                <textarea id="description" name="description" rows="5">${todo != null ? todo.description : ''}</textarea>
+            </div>
+            
+            <div class="form-group">
+                <label for="targetDate">Fälligkeitsdatum:</label>
+                <input type="date" id="targetDate" name="targetDate" value="${todo != null ? todo.targetDate : ''}" required>
+            </div>
+            
+            <div class="form-group">
+                <button type="submit" class="btn save-btn">Speichern</button>
+                <a href="${pageContext.request.contextPath}/todos" class="btn cancel-btn">Abbrechen</a>
+            </div>
+        </form>
+    </div>
+</body>
+</html>
--- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-list.jsp
+++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-list.jsp
@ -0,0 +1,80 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Meine Aufgaben</title>
+    <link rel="stylesheet" href="${pageContext.request.contextPath}/css/style.css">
+</head>
+<body>
+    <div class="container">
+        <header>
+            <h1>Meine Aufgaben</h1>
+            <div class="user-info">
+                <span>Hallo, ${username}!</span>
+                <a href="${pageContext.request.contextPath}/auth/logout" class="logout-btn">Abmelden</a>
+            </div>
+        </header>
+        
+        <div class="todo-actions">
+            <a href="${pageContext.request.contextPath}/todos/new" class="btn add-btn">Neue Aufgabe</a>
+        </div>
+        
+        <c:choose>
+            <c:when test="${empty todos}">
+                <div class="no-todos">
+                    <p>Keine Aufgaben vorhanden. Erstellen Sie eine neue Aufgabe!</p>
+                </div>
+            </c:when>
+            <c:otherwise>
+                <table class="todo-table">
+                    <thead>
+                        <tr>
+                            <th>Titel</th>
+                            <th>Beschreibung</th>
+                            <th>Fälligkeitsdatum</th>
+                            <th>Status</th>
+                            <th>Aktionen</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <c:forEach var="todo" items="${todos}">
+                            <tr class="${todo.completed ? 'completed' : ''}">
+                                <td>${todo.title}</td>
+                                <td>${todo.description}</td>
+                                <td>${todo.targetDate}</td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="${todo.completed}">
+                                            <span class="status completed">Erledigt</span>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <span class="status pending">Offen</span>
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    <a href="${pageContext.request.contextPath}/todos/edit?id=${todo.id}" class="btn edit-btn">Bearbeiten</a>
+                                    <a href="${pageContext.request.contextPath}/todos/delete?id=${todo.id}" class="btn delete-btn" onclick="return confirm('Möchten Sie diese Aufgabe wirklich löschen?')">Löschen</a>
+                                    <a href="${pageContext.request.contextPath}/todos/complete?id=${todo.id}" class="btn complete-btn">
+                                        <c:choose>
+                                            <c:when test="${todo.completed}">
+                                                Als offen markieren
+                                            </c:when>
+                                            <c:otherwise>
+                                                Als erledigt markieren
+                                            </c:otherwise>
+                                        </c:choose>
+                                    </a>
+                                </td>
+                            </tr>
+                        </c:forEach>
+                    </tbody>
+                </table>
+            </c:otherwise>
+        </c:choose>
+    </div>
+</body>
+</html>
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.dockerignore
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.dockerignore
@ -0,0 +1,8 @@
+.git
+.github
+.settings
+target
+*.iml
+.idea
+.vscode
+node_modules
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.gitignore
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.gitignore
@ -0,0 +1,27 @@
+# Maven
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# IDE-spezifische Dateien
+.idea/
+*.iws
+*.iml
+*.ipr
+.vscode/
+.settings/
+.classpath
+.project
+.factorypath
+
+# Temporäre Dateien
+*.log
+*.tmp
+*.temp
+
+# Lokale Konfigurationsdateien
+src/main/resources/application-local.properties
+
+# Devcontainer Volumen
+.devcontainer/postgres-data/
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile
@ -0,0 +1,12 @@
+FROM icr.io/appcafe/open-liberty:25.0.0.5-kernel-slim-java17-openj9-ubi
+
+COPY --chown=1001:0 src/main/liberty/config /config
+# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen
+RUN mkdir -p /config/lib && \
+    curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar
+
+RUN features.sh
+
+#COPY --chown=1001:0 target/*.war /config/apps
+
+RUN configure.sh
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile.dev
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile.dev
@ -0,0 +1,14 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+
+#ARG INSTALL_MAVEN="true"
+#ARG MAVEN_VERSION=""
+
+#ARG INSTALL_GRADLE="false"
+#ARG GRADLE_VERSION=""
+
+#RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
+#  && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
+
+# Hier kannst du zusätzliche Tools oder Bibliotheken installieren, die du für die Entwicklung benötigst.
+# Zum Beispiel den PostgreSQL JDBC-Treiber, wenn du ihn für die Entwicklung benötigst:
+RUN apt-get update && apt-get install -y curl && curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/devcontainer.json
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/devcontainer.json
@ -0,0 +1,14 @@
+{
+  "name": "Java & PostgreSQL",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "forwardPorts": [9080, 5432, 9433],
+  "postCreateCommand": "mvn clean install -DskipTests",
+  "remoteUser": "vscode",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
+    "ghcr.io/devcontainers-extra/features/maven-sdkman:2": {"version": "latest"},
+    "ghcr.io/devcontainers/features/git:1": {"version": "latest"}
+}
+}
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/docker-compose.yml
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/docker-compose.yml
@ -0,0 +1,60 @@
+services:
+    app:
+        container_name: javadev
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile.dev
+        volumes:
+            - ../..:/workspaces:cached
+            - ./app:/app
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        networks:
+            - my_network
+        command: sleep infinity
+
+    openliberty:
+        container_name: openliberty_app
+        build:
+            context: ../
+            dockerfile: .devcontainer/Dockerfile
+        ports:
+            - "9080:9080"
+            - "9443:9443"
+        environment:
+            POSTGRES_HOST: postgresdb
+            POSTGRES_PORT: 5432
+            POSTGRES_DB: todo_db
+            POSTGRES_USER: postgres
+            POSTGRES_PASSWORD: postgres
+        volumes:
+            - ./app:/config/dropins
+        depends_on:
+            - db
+        networks:
+            - my_network
+
+    db:
+        container_name: postgresdb
+        image: postgres:latest
+        restart: unless-stopped
+        volumes:
+            - postgres-data:/var/lib/postgresql/data
+            - ./init.sql:/docker-entrypoint-initdb.d/init.sql
+        environment:
+            POSTGRES_PASSWORD: postgres
+            POSTGRES_USER: postgres
+            POSTGRES_DB: todo_db
+        networks:
+            - my_network
+
+volumes:
+    postgres-data:
+
+networks:
+    my_network:
+        driver: bridge
--- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/init.sql
+++ b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/init.sql
@ -0,0 +1,19 @@
+CREATE TABLE users (
+    id SERIAL PRIMARY KEY,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(255) NOT NULL,
+    email VARCHAR(255) NOT NULL
+);
+
+CREATE TABLE todos (
+    id SERIAL PRIMARY KEY,
+    title VARCHAR(255) NOT NULL,
+    description VARCHAR(1000),
+    target_date DATE,
+    completed BOOLEAN,
+    user_id BIGINT NOT NULL,
+    FOREIGN KEY (user_id) REFERENCES users(id)
+);
+
+INSERT INTO users (username, password, email) VALUES 
+('test', '$2a$12$nt7xQKNDKZhxQFZGD5Wy0.Uh0wdPtWDgwfnWnPLgBWnQDGGkNLKBi', 'test@example.com');
--- a/cmd/jws/projects/jakarta-rest-todo/pom.xml
+++ b/cmd/jws/projects/jakarta-rest-todo/pom.xml
@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.todoapp</groupId>
+    <artifactId>todo-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <jakartaee.version>10.0.0</jakartaee.version>
+        <hibernate.version>6.6.22.Final</hibernate.version>
+        <postgresql.version>42.7.6</postgresql.version>
+    </properties>
+
+    <dependencies>
+        <!-- Jakarta EE 10 API -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>${jakartaee.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Hibernate Core -->
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+
+        <!-- PostgreSQL JDBC Driver -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
+        </dependency>
+
+        <!-- JSTL -->
+        <dependency>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>3.0.1</version>
+        </dependency>
+
+      <!-- JAX-RS -->
+<dependency>
+    <groupId>jakarta.ws.rs</groupId>
+    <artifactId>jakarta.ws.rs-api</artifactId>
+    <version>3.1.0</version>
+    <scope>provided</scope>
+</dependency>
+
+<!-- JSON-Binding -->
+<dependency>
+    <groupId>jakarta.json.bind</groupId>
+    <artifactId>jakarta.json.bind-api</artifactId>
+    <version>3.0.1</version>
+    <scope>provided</scope>
+</dependency>
+
+<!-- JSON-Processing -->
+<dependency>
+    <groupId>jakarta.json</groupId>
+    <artifactId>jakarta.json-api</artifactId>
+    <version>2.1.3</version>
+    <scope>provided</scope>
+</dependency>
+<dependency>
+    <groupId>org.hibernate.orm</groupId>
+    <artifactId>hibernate-core</artifactId>
+    <version>7.0.0.Final</version>  <!-- Stelle sicher, dass du eine aktuelle Version benutzt -->
+</dependency>
+        <!-- Mindestens zum Passwort-Hashing -->
+        <dependency>
+            <groupId>at.favre.lib</groupId>
+            <artifactId>bcrypt</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>todo-app</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
+            </plugin>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>3.11.4</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/TodoDAO.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/TodoDAO.java
@ -0,0 +1,135 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.Todo;
+import com.todoapp.model.User;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import java.util.List;
+
+@ApplicationScoped
+public class TodoDAO {
+
+  @Inject
+  private SessionFactory sessionFactory;
+
+  @Inject
+  private UserDAO userDAO;
+
+  public Todo saveTodo(Todo todo, String username) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+
+      // Benutzer aus der Datenbank holen
+      User user = userDAO.getUserByUsername(username);
+      if (user == null) {
+        throw new IllegalArgumentException("User not found");
+      }
+
+      todo.setUser(user);
+      session.persist(todo);
+      transaction.commit();
+      return todo;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error saving todo", e);
+    }
+  }
+
+  public Todo updateTodo(Todo todo) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+      Todo updatedTodo = session.merge(todo);
+      transaction.commit();
+      return updatedTodo;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error updating todo", e);
+    }
+  }
+
+  public boolean deleteTodo(Long id) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+      Todo todo = session.get(Todo.class, id);
+      if (todo != null) {
+        session.remove(todo);
+        transaction.commit();
+        return true;
+      }
+      return false;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error deleting todo", e);
+    }
+  }
+
+  public Todo getTodoById(Long id) {
+    try (Session session = sessionFactory.openSession()) {
+      return session.get(Todo.class, id);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting todo by ID", e);
+    }
+  }
+
+  public List<Todo> getAllTodos() {
+    try (Session session = sessionFactory.openSession()) {
+      return session.createQuery("FROM Todo", Todo.class).list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting all todos", e);
+    }
+  }
+
+  public List<Todo> getTodosByUsername(String username) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.username = :username ORDER BY t.completed, t.targetDate", Todo.class);
+      query.setParameter("username", username);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting todos by username", e);
+    }
+  }
+
+  public List<Todo> getCompletedTodosByUsername(String username) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.username = :username AND t.completed = true", Todo.class);
+      query.setParameter("username", username);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting completed todos", e);
+    }
+  }
+
+  public List<Todo> getIncompleteTodosByUsername(String username) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<Todo> query = session.createQuery(
+          "FROM Todo t WHERE t.user.username = :username AND t.completed = false ORDER BY t.targetDate", Todo.class);
+      query.setParameter("username", username);
+      return query.list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting incomplete todos", e);
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/UserDAO.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/UserDAO.java
@ -0,0 +1,124 @@
+package com.todoapp.dao;
+
+import com.todoapp.model.User;
+import com.todoapp.util.HibernateUtil;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import java.util.List;
+import java.util.Optional;
+
+@ApplicationScoped
+public class UserDAO {
+
+  @Inject
+  private SessionFactory sessionFactory;
+
+  public User saveUser(User user) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+      session.persist(user);
+      transaction.commit();
+      return user;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error saving user", e);
+    }
+  }
+
+  public User updateUser(User user) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+      User updatedUser = session.merge(user);
+      transaction.commit();
+      return updatedUser;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error updating user", e);
+    }
+  }
+
+  public boolean deleteUser(Long id) {
+    Transaction transaction = null;
+    try (Session session = sessionFactory.openSession()) {
+      transaction = session.beginTransaction();
+      User user = session.get(User.class, id);
+      if (user != null) {
+        session.remove(user);
+        transaction.commit();
+        return true;
+      }
+      return false;
+    } catch (Exception e) {
+      if (transaction != null) {
+        transaction.rollback();
+      }
+      e.printStackTrace();
+      throw new RuntimeException("Error deleting user", e);
+    }
+  }
+
+  public User getUserById(Long id) {
+    try (Session session = sessionFactory.openSession()) {
+      return session.get(User.class, id);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting user by ID", e);
+    }
+  }
+
+  public User getUserByUsername(String username) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<User> query = session.createQuery("FROM User WHERE username = :username", User.class);
+      query.setParameter("username", username);
+      return query.uniqueResult();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting user by username", e);
+    }
+  }
+
+  public List<User> getAllUsers() {
+    try (Session session = sessionFactory.openSession()) {
+      return session.createQuery("FROM User", User.class).list();
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error getting all users", e);
+    }
+  }
+
+  public boolean usernameExists(String username) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<Long> query = session.createQuery(
+          "SELECT COUNT(u) FROM User u WHERE u.username = :username", Long.class);
+      query.setParameter("username", username);
+      return query.uniqueResult() > 0;
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error checking if username exists", e);
+    }
+  }
+
+  public boolean emailExists(String email) {
+    try (Session session = sessionFactory.openSession()) {
+      Query<Long> query = session.createQuery(
+          "SELECT COUNT(u) FROM User u WHERE u.email = :email", Long.class);
+      query.setParameter("email", email);
+      return query.uniqueResult() > 0;
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException("Error checking if email exists", e);
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/LoginRequest.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/LoginRequest.java
@ -0,0 +1,23 @@
+package com.todoapp.dto;
+
+public class LoginRequest {
+  private String username;
+  private String password;
+
+  // Getter und Setter
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java
@ -0,0 +1,32 @@
+package com.todoapp.dto;
+
+public class RegistrationRequest {
+  private String username;
+  private String password;
+  private String email;
+
+  // Getter und Setter
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/Todo.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/Todo.java
@ -0,0 +1,109 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import jakarta.json.bind.annotation.JsonbTransient;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "todos")
+public class Todo implements Serializable {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @Column(nullable = false)
+  private String title;
+
+  @Column(length = 1000)
+  private String description;
+
+  @Column(name = "target_date")
+  @Temporal(TemporalType.DATE)
+  private Date targetDate;
+
+  @Column
+  private boolean completed;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "user_id", nullable = false)
+  @JsonbTransient // Verhindert zirkuläre Referenzen
+  private User user;
+
+  // Konstruktoren
+  public Todo() {
+  }
+
+  public Todo(String title, String description, Date targetDate, boolean completed) {
+    this.title = title;
+    this.description = description;
+    this.targetDate = targetDate;
+    this.completed = completed;
+  }
+
+  // Getter und Setter
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Date getTargetDate() {
+    return targetDate;
+  }
+
+  public void setTargetDate(Date targetDate) {
+    this.targetDate = targetDate;
+  }
+
+  public boolean isCompleted() {
+    return completed;
+  }
+
+  public void setCompleted(boolean completed) {
+    this.completed = completed;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+
+  // Zusätzliche Methode für REST-Antworten
+  public Long getUserId() {
+    return user != null ? user.getId() : null;
+  }
+
+  @Override
+  public String toString() {
+    return "Todo{" +
+        "id=" + id +
+        ", title='" + title + '\'' +
+        ", description='" + description + '\'' +
+        ", targetDate=" + targetDate +
+        ", completed=" + completed +
+        '}';
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/User.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/User.java
@ -0,0 +1,101 @@
+package com.todoapp.model;
+
+import jakarta.persistence.*;
+import jakarta.json.bind.annotation.JsonbTransient;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "users")
+public class User implements Serializable {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @Column(nullable = false, unique = true)
+  private String username;
+
+  @Column(nullable = false)
+  @JsonbTransient // Verhindert, dass das Passwort in JSON serialisiert wird
+  private String password;
+
+  @Column(nullable = false)
+  private String email;
+
+  @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+  @JsonbTransient // Verhindert zirkuläre Referenzen bei der JSON-Serialisierung
+  private List<Todo> todos = new ArrayList<>();
+
+  // Konstruktoren
+  public User() {
+  }
+
+  public User(String username, String password, String email) {
+    this.username = username;
+    this.password = password;
+    this.email = email;
+  }
+
+  // Getter und Setter
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public List<Todo> getTodos() {
+    return todos;
+  }
+
+  public void setTodos(List<Todo> todos) {
+    this.todos = todos;
+  }
+
+  // Hilfsmethoden
+  public void addTodo(Todo todo) {
+    todos.add(todo);
+    todo.setUser(this);
+  }
+
+  public void removeTodo(Todo todo) {
+    todos.remove(todo);
+    todo.setUser(null);
+  }
+
+  @Override
+  public String toString() {
+    return "User{" +
+        "id=" + id +
+        ", username='" + username + '\'' +
+        ", email='" + email + '\'' +
+        '}';
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/AuthResource.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/AuthResource.java
@ -0,0 +1,95 @@
+package com.todoapp.rest;
+
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import com.todoapp.dto.LoginRequest;
+import com.todoapp.dto.RegistrationRequest;
+
+import jakarta.annotation.security.RolesAllowed;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import at.favre.lib.crypto.bcrypt.BCrypt;
+import java.util.Map;
+
+@Path("/auth")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class AuthResource {
+
+  @Inject
+  private UserDAO userDAO;
+
+  @POST
+  @Path("/register")
+  public Response register(RegistrationRequest request) {
+    if (request.getUsername() == null || request.getPassword() == null || request.getEmail() == null) {
+      return Response.status(Response.Status.BAD_REQUEST)
+          .entity(Map.of("error", "Username, password, and email are required"))
+          .build();
+    }
+
+    if (userDAO.usernameExists(request.getUsername())) {
+      System.out.println(userDAO.usernameExists(request.getUsername()));
+      return Response.status(Response.Status.CONFLICT)
+          .entity(Map.of("error", "Username already exists"))
+          .build();
+    }
+
+    if (userDAO.emailExists(request.getEmail())) {
+      return Response.status(Response.Status.CONFLICT)
+          .entity(Map.of("error", "Email already exists"))
+          .build();
+    }
+
+    User user = new User();
+    user.setUsername(request.getUsername());
+    user.setEmail(request.getEmail());
+
+    String hashedPassword = BCrypt.withDefaults()
+        .hashToString(12, request.getPassword().toCharArray());
+    user.setPassword(hashedPassword);
+
+    userDAO.saveUser(user);
+
+    return Response.status(Response.Status.CREATED)
+        .entity(Map.of("message", "User registered successfully"))
+        .build();
+  }
+
+  @POST
+  @RolesAllowed("user")
+  @Path("/login")
+  public Response login(LoginRequest request) {
+    // Validierung
+    if (request.getUsername() == null || request.getPassword() == null) {
+      return Response.status(Response.Status.BAD_REQUEST)
+          .entity(Map.of("error", "Username and password are required"))
+          .build();
+    }
+
+    // Benutzer suchen
+    User user = userDAO.getUserByUsername(request.getUsername());
+    if (user == null) {
+      return Response.status(Response.Status.UNAUTHORIZED)
+          .entity(Map.of("error", "Invalid credentials"))
+          .build();
+    }
+
+    // Passwort überprüfen
+    BCrypt.Result result = BCrypt.verifyer()
+        .verify(request.getPassword().toCharArray(), user.getPassword());
+    if (!result.verified) {
+      return Response.status(Response.Status.UNAUTHORIZED)
+          .entity(Map.of("error", "Invalid credentials"))
+          .build();
+    }
+
+    // Erfolgreiche Anmeldung
+    return Response.ok(Map.of(
+        "message", "Login successful",
+        "username", user.getUsername(),
+        "email", user.getEmail())).build();
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoApplication.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoApplication.java
@ -0,0 +1,9 @@
+package com.todoapp.rest;
+
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
+
+@ApplicationPath("/api")
+public class TodoApplication extends Application {
+  // Die leere Klasse ist ausreichend, um den REST-Endpunkt zu definieren
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoResource.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoResource.java
@ -0,0 +1,130 @@
+package com.todoapp.rest;
+
+import com.todoapp.dao.TodoDAO;
+import com.todoapp.model.Todo;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import java.util.List;
+
+@Path("/todos")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class TodoResource {
+
+  @Inject
+  private TodoDAO todoDAO;
+
+  @GET
+  public Response getAllTodos(@Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    List<Todo> todos = todoDAO.getTodosByUsername(username);
+    return Response.ok(todos).build();
+  }
+
+  @GET
+  @Path("/{id}")
+  public Response getTodoById(@PathParam("id") Long id, @Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    Todo todo = todoDAO.getTodoById(id);
+
+    if (todo == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
+    }
+
+    // Sicherheitscheck: Nutzer darf nur eigene Todos sehen
+    if (!todo.getUser().getUsername().equals(username)) {
+      return Response.status(Response.Status.FORBIDDEN).build();
+    }
+
+    return Response.ok(todo).build();
+  }
+
+  @GET
+  @Path("/completed")
+  public Response getCompletedTodos(@Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    List<Todo> todos = todoDAO.getCompletedTodosByUsername(username);
+    return Response.ok(todos).build();
+  }
+
+  @GET
+  @Path("/incomplete")
+  public Response getIncompleteTodos(@Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    List<Todo> todos = todoDAO.getIncompleteTodosByUsername(username);
+    return Response.ok(todos).build();
+  }
+
+  @POST
+  public Response createTodo(Todo todo, @Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    todo = todoDAO.saveTodo(todo, username);
+    return Response.status(Response.Status.CREATED).entity(todo).build();
+  }
+
+  @PUT
+  @Path("/{id}")
+  public Response updateTodo(@PathParam("id") Long id, Todo updatedTodo, @Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    Todo existingTodo = todoDAO.getTodoById(id);
+
+    if (existingTodo == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
+    }
+
+    // Sicherheitscheck: Nutzer darf nur eigene Todos aktualisieren
+    if (!existingTodo.getUser().getUsername().equals(username)) {
+      return Response.status(Response.Status.FORBIDDEN).build();
+    }
+
+    // ID und Benutzer beibehalten
+    updatedTodo.setId(id);
+    updatedTodo.setUser(existingTodo.getUser());
+
+    todoDAO.updateTodo(updatedTodo);
+    return Response.ok(updatedTodo).build();
+  }
+
+  @DELETE
+  @Path("/{id}")
+  public Response deleteTodo(@PathParam("id") Long id, @Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    Todo todo = todoDAO.getTodoById(id);
+
+    if (todo == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
+    }
+
+    // Sicherheitscheck: Nutzer darf nur eigene Todos löschen
+    if (!todo.getUser().getUsername().equals(username)) {
+      return Response.status(Response.Status.FORBIDDEN).build();
+    }
+
+    boolean deleted = todoDAO.deleteTodo(id);
+    return deleted ? Response.noContent().build() : Response.status(Response.Status.NOT_FOUND).build();
+  }
+
+  @PUT
+  @Path("/{id}/complete")
+  public Response markTodoComplete(@PathParam("id") Long id, @Context SecurityContext securityContext) {
+    String username = securityContext.getUserPrincipal().getName();
+    Todo todo = todoDAO.getTodoById(id);
+
+    if (todo == null) {
+      return Response.status(Response.Status.NOT_FOUND).build();
+    }
+
+    // Sicherheitscheck: Nutzer darf nur eigene Todos aktualisieren
+    if (!todo.getUser().getUsername().equals(username)) {
+      return Response.status(Response.Status.FORBIDDEN).build();
+    }
+
+    todo.setCompleted(true);
+    todoDAO.updateTodo(todo);
+    return Response.ok(todo).build();
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/BasicAuthenticationFilter.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/BasicAuthenticationFilter.java
@ -0,0 +1,104 @@
+package com.todoapp.security;
+
+import com.todoapp.dao.UserDAO;
+import com.todoapp.model.User;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Priorities;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.SecurityContext;
+import jakarta.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.security.Principal;
+import java.util.Base64;
+import at.favre.lib.crypto.bcrypt.BCrypt;
+
+@Provider
+@Priority(Priorities.AUTHENTICATION)
+@ApplicationScoped
+public class BasicAuthenticationFilter implements ContainerRequestFilter {
+
+  @Inject
+  private UserDAO userDAO;
+
+  @Override
+  public void filter(ContainerRequestContext requestContext) throws IOException {
+    System.out.println("BasicAuthenticationFilter triggered for path: " + requestContext.getUriInfo().getPath());
+    String path = requestContext.getUriInfo().getPath();
+    if (path.endsWith("auth/register") || path.endsWith("auth/login")) {
+      return;
+    }
+
+    String authHeader = requestContext.getHeaderString(HttpHeaders.AUTHORIZATION);
+    if (authHeader == null || !authHeader.startsWith("Basic ")) {
+      abortWithUnauthorized(requestContext);
+      return;
+    }
+
+    String[] credentials = extractCredentials(authHeader);
+    if (credentials.length != 2) {
+      abortWithUnauthorized(requestContext);
+      return;
+    }
+
+    String username = credentials[0];
+    String password = credentials[1];
+
+    User user = userDAO.getUserByUsername(username);
+    if (user == null) {
+      abortWithUnauthorized(requestContext);
+      return;
+    }
+
+    BCrypt.Result result = BCrypt.verifyer()
+        .verify(password.toCharArray(), user.getPassword());
+    if (!result.verified) {
+      abortWithUnauthorized(requestContext);
+      return;
+    }
+
+    final SecurityContext currentSecurityContext = requestContext.getSecurityContext();
+    requestContext.setSecurityContext(new SecurityContext() {
+      @Override
+      public Principal getUserPrincipal() {
+        return () -> username;
+      }
+
+      @Override
+      public boolean isUserInRole(String role) {
+        return true;
+      }
+
+      @Override
+      public boolean isSecure() {
+        return currentSecurityContext.isSecure();
+      }
+
+      @Override
+      public String getAuthenticationScheme() {
+        return "BASIC";
+      }
+    });
+    System.out.println("SecurityContext gesetzt für User: " + username);
+    System.out.println("User in Rolle user: " + requestContext.getSecurityContext().isUserInRole("user"));
+
+  }
+
+  private String[] extractCredentials(String authHeader) {
+    String base64Credentials = authHeader.substring("Basic ".length()).trim();
+    byte[] decoded = Base64.getDecoder().decode(base64Credentials);
+    String credentials = new String(decoded);
+    return credentials.split(":", 2);
+  }
+
+  private void abortWithUnauthorized(ContainerRequestContext requestContext) {
+    requestContext.abortWith(Response
+        .status(Response.Status.UNAUTHORIZED)
+        .header(HttpHeaders.WWW_AUTHENTICATE, "Basic realm=\"TodoApp\"")
+        .build());
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/CORSFilter.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/CORSFilter.java
@ -0,0 +1,20 @@
+package com.todoapp.security;
+
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerResponseContext;
+import jakarta.ws.rs.container.ContainerResponseFilter;
+import jakarta.ws.rs.ext.Provider;
+import java.io.IOException;
+
+@Provider
+public class CORSFilter implements ContainerResponseFilter {
+
+  @Override
+  public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+      throws IOException {
+    responseContext.getHeaders().add("Access-Control-Allow-Origin", "*");
+    responseContext.getHeaders().add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS");
+    responseContext.getHeaders().add("Access-Control-Allow-Headers", "Content-Type, Authorization");
+    responseContext.getHeaders().add("Access-Control-Max-Age", "86400");
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/util/HibernateUtil.java
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/util/HibernateUtil.java
@ -0,0 +1,41 @@
+package com.todoapp.util;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+
+@ApplicationScoped
+public class HibernateUtil {
+
+  private static SessionFactory sessionFactory;
+
+  @Produces
+  @ApplicationScoped
+  public SessionFactory getSessionFactory() {
+    if (sessionFactory == null) {
+      try {
+        Configuration configuration = new Configuration();
+        configuration.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver");
+        configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgresdb:5432/todo_db");
+        configuration.setProperty("hibernate.connection.username", "postgres");
+        configuration.setProperty("hibernate.connection.password", "postgres");
+
+        // Entity-Klassen registrieren
+        configuration.addAnnotatedClass(com.todoapp.model.User.class);
+        configuration.addAnnotatedClass(com.todoapp.model.Todo.class);
+
+        sessionFactory = configuration.buildSessionFactory();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+    return sessionFactory;
+  }
+
+  public static void shutdown() {
+    if (sessionFactory != null) {
+      sessionFactory.close();
+    }
+  }
+}
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/liberty/config/server.xml
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/liberty/config/server.xml
@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server description="OpenLiberty Todo App Server">
+
+    <featureManager>
+        <feature>servlet-6.0</feature>
+        <feature>pages-3.1</feature>
+        <feature>jdbc-4.2</feature>
+        <feature>jndi-1.0</feature>
+        <feature>monitor-1.0</feature>
+        <feature>restfulWS-3.1</feature>
+        <feature>jsonb-3.0</feature>
+        <feature>jsonp-2.1</feature>
+        <!-- <feature>appSecurity-5.0</feature> -->
+        <feature>transportSecurity-1.0</feature>
+    </featureManager>
+
+    <httpEndpoint id="defaultHttpEndpoint"
+                  httpPort="9080"
+                  httpsPort="9443" />
+
+    <applicationManager autoExpand="true" />
+
+  <dataSource id="PostgresDataSource" jndiName="jdbc/PostgresDataSource">
+    <jdbcDriver libraryRef="PostgresLib" />
+    <properties.postgresql serverName="${POSTGRES_HOST}"
+                          portNumber="${POSTGRES_PORT}"
+                          databaseName="${POSTGRES_DB}"
+                          user="${POSTGRES_USER}"
+                          password="${POSTGRES_PASSWORD}" />
+</dataSource>
+
+
+    <library id="PostgresLib">
+        <fileset dir="${server.config.dir}/lib" includes="postgresql-*.jar" />
+    </library>
+
+    <webApplication location="todo-app.war" contextRoot="/todo-app" />
+
+</server>
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/resources/META-INF/persistence.xml
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/resources/META-INF/persistence.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+             version="3.0">
+  <persistence-unit name="todoPU" transaction-type="RESOURCE_LOCAL">
+    <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+    <class>com.todoapp.model.User</class>
+    <class>com.todoapp.model.Todo</class>
+    <properties>
+        <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
+        <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://postgresdb:5432/todo_db"/>
+        <property name="jakarta.persistence.jdbc.user" value="postgres"/>
+        <property name="jakarta.persistence.jdbc.password" value="postgres"/>
+        <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
+        <property name="hibernate.hbm2ddl.auto" value="update"/>
+        <property name="hibernate.show_sql" value="true"/>
+    </properties>
+</persistence-unit>
+</persistence>
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/resources/hibernate.cfg.xml
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/resources/hibernate.cfg.xml
@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-configuration PUBLIC
+        "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+      <session-factory>
+        <!-- JNDI connection settings -->
+        <property name="hibernate.connection.datasource">jdbc/PostgresDataSource</property>
+
+        <!-- Select our SQL dialect -->
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+
+        <!-- Echo the SQL to stdout -->
+        <property name="hibernate.show_sql">true</property>
+
+        <!-- Set the current session context -->
+        <property name="hibernate.current_session_context_class">thread</property>
+
+        <!-- Drop and re-create the database schema on startup -->
+        <property name="hibernate.hbm2ddl.auto">update</property>
+
+        <!-- Entity mapping -->
+        <mapping class="com.todoapp.model.User"/>
+        <mapping class="com.todoapp.model.Todo"/>
+    </session-factory>
+</hibernate-configuration>
--- a/cmd/jws/projects/jakarta-rest-todo/src/main/webapp/WEB-INF/web.xml
+++ b/cmd/jws/projects/jakarta-rest-todo/src/main/webapp/WEB-INF/web.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
+
+    <display-name>Todo Application</display-name>
+
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+</web-app>
--- a/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/Dockerfile
+++ b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/Dockerfile
@ -1,18 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
-
-ARG INSTALL_MAVEN="false"
-ARG MAVEN_VERSION=""
-
-ARG INSTALL_GRADLE="false"
-ARG GRADLE_VERSION=""
-
-RUN apt-get update && apt-get upgrade -y && \
-  apt-get install -y \
-  git
-
-RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
-  && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
-
-RUN mkdir -p /workspaces/${localWorkspaceFolderBasename}  && chown -R vscode:vscode /workspaces/${localWorkspaceFolderBasename}
-
-ENTRYPOINT ["/bin/bash"]
--- a/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/devcontainer.json
+++ b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/devcontainer.json
@ -1,9 +0,0 @@
-{
-  "name": "Jakarta EE Todo App & PostgreSQL",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "app",
-  "workspaceFolder": "/workspaces",
-  "extensions": ["vscjava.vscode-java-pack", "redhat.vscode-xml"],
-  "forwardPorts": [9080],
-  "remoteUser": "vscode"
-}
--- a/cmd/jws/projects/jakarta-servlet-todo/pom.xml
+++ b/cmd/jws/projects/jakarta-servlet-todo/pom.xml
@ -1,49 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.example</groupId>
-    <artifactId>jakarta-servlet-todo</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>war</packaging>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-        <jakartaee.version>10.0.0</jakartaee.version>
-        <hibernate.version>6.0.0.Final</hibernate.version>
-        <postgresql.version>42.3.1</postgresql.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-            <version>${jakartaee.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.orm</groupId>
-            <artifactId>hibernate-core</artifactId>
-            <version>${hibernate.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgresql.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.2</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>
-
--- a/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/dao/TodoDAO.java
+++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/dao/TodoDAO.java
@ -1,36 +0,0 @@
-package com.example.dao;
-
-import com.example.model.Todo;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
-import jakarta.transaction.Transactional;
-
-import java.util.List;
-
-public class TodoDAO {
-
-  @PersistenceContext
-  private EntityManager em;
-
-  @Transactional
-  public void create(Todo todo) {
-    em.persist(todo);
-  }
-
-  public List<Todo> findAll() {
-    return em.createQuery("SELECT t FROM Todo t", Todo.class).getResultList();
-  }
-
-  @Transactional
-  public void update(Todo todo) {
-    em.merge(todo);
-  }
-
-  @Transactional
-  public void delete(Long id) {
-    Todo todo = em.find(Todo.class, id);
-    if (todo != null) {
-      em.remove(todo);
-    }
-  }
-}
--- a/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/model/Todo.java
+++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/model/Todo.java
@ -1,43 +0,0 @@
-package com.example.model;
-
-import jakarta.persistence.*;
-
-@Entity
-@Table(name = "todos")
-public class Todo {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
-
-  @Column(nullable = false)
-  private String title;
-
-  @Column(nullable = false)
-  private boolean completed;
-
-  // Getter und Setter
-  public Long getId() {
-    return id;
-  }
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  public String getTitle() {
-    return title;
-  }
-
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  public boolean isCompleted() {
-    return completed;
-  }
-
-  public void setCompleted(boolean completed) {
-    this.completed = completed;
-  }
-}
--- a/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/servlet/TodoServlet.java
+++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/servlet/TodoServlet.java
@ -1,40 +0,0 @@
-package com.example.servlet;
-
-import com.example.dao.TodoDAO;
-import com.example.model.Todo;
-import jakarta.inject.Inject;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import java.io.IOException;
-import java.util.List;
-
-@WebServlet("/todos")
-public class TodoServlet extends HttpServlet {
-
-  @Inject
-  private TodoDAO todoDAO;
-
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-    List<Todo> todos = todoDAO.findAll();
-    req.setAttribute("todos", todos);
-    req.getRequestDispatcher("/index.jsp").forward(req, resp);
-  }
-
-  @Override
-  protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-    String title = req.getParameter("title");
-    boolean completed = "on".equals(req.getParameter("completed"));
-
-    Todo todo = new Todo();
-    todo.setTitle(title);
-    todo.setCompleted(completed);
-
-    todoDAO.create(todo);
-    resp.sendRedirect(req.getContextPath() + "/todos");
-  }
-}
--- a/cmd/jws/projects/jakarta-servlet-todo/src/main/resources/META-INF/persistence.xml
+++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/resources/META-INF/persistence.xml
@ -1,19 +0,0 @@
-<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
-             version="3.0">
-
-  <persistence-unit name="todoPU">
-      <class>com.example.model.Todo</class>
-      <properties>
-          <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-          <property name="jakarta.persistence.jdbc.url" value="jdbc:postgresql://db:5432/tododb"/>
-          <property name="jakarta.persistence.jdbc.user" value="todouser"/>
-          <property name="jakarta.persistence.jdbc.password" value="todopass"/>
-          <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
-          <property name="hibernate.hbm2ddl.auto" value="update"/>
-      </properties>
-  </persistence-unit>
-
-</persistence>
-
--- a/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/WEB-INF/web.xml
+++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/WEB-INF/web.xml
@ -1,9 +0,0 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
-         version="4.0">
-
-  <display-name>JakartaEE Todo App</display-name>
-
-</web-app>
-
--- a/cmd/jws/projects/spring-boot-todo/.devcontainer/.dockerignore
+++ b/cmd/jws/projects/spring-boot-todo/.devcontainer/.dockerignore
@ -0,0 +1,8 @@
+.git
+.github
+.settings
+target
+*.iml
+.idea
+.vscode
+node_modules
--- a/cmd/jws/projects/spring-boot-todo/.devcontainer/.gitignore
+++ b/cmd/jws/projects/spring-boot-todo/.devcontainer/.gitignore
@ -0,0 +1,27 @@
+# Maven
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# IDE-spezifische Dateien
+.idea/
+*.iws
+*.iml
+*.ipr
+.vscode/
+.settings/
+.classpath
+.project
+.factorypath
+
+# Temporäre Dateien
+*.log
+*.tmp
+*.temp
+
+# Lokale Konfigurationsdateien
+src/main/resources/application-local.properties
+
+# Devcontainer Volumen
+.devcontainer/postgres-data/
--- a/cmd/jws/projects/spring-boot-todo/.devcontainer/Dockerfile.dev
+++ b/cmd/jws/projects/spring-boot-todo/.devcontainer/Dockerfile.dev
@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/devcontainers/java:1-21-bullseye
+
+RUN apt-get update && apt-get install -y curl maven
+
+RUN curl -o /tmp/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar && \
+  mkdir -p /usr/local/lib/ && mv /tmp/postgresql.jar /usr/local/lib/postgresql.jar
+
+WORKDIR /app
+
+COPY . .
+
+RUN mvn clean install -DskipTests
+
+CMD ["mvn", "spring-boot:run"]
+
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
git	90e307a35b	Merge pull request 'chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.22.final' (#21 ) from renovate/hibernate.version into main Reviewed-on: #21	2025-09-07 12:41:08 +02:00
Renovate Bot	3082aef1e8	chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.22.final	2025-09-07 12:38:08 +02:00
git	0bc0695d37	Merge pull request 'chore(deps): update dependency io.openliberty.tools:liberty-maven-plugin to v3.11.4' (#20 ) from renovate/io.openliberty.tools-liberty-maven-plugin-3.x into main Reviewed-on: #20	2025-09-07 12:38:00 +02:00
Renovate Bot	719ae05a3a	chore(deps): update dependency io.openliberty.tools:liberty-maven-plugin to v3.11.4	2025-07-25 07:30:29 +00:00
git	8196feb632	Merge pull request 'chore(deps): update icr.io/appcafe/open-liberty docker tag to v25' (#19 ) from renovate/icr.io-appcafe-open-liberty-25.x into main Reviewed-on: #19	2025-06-05 17:33:34 +02:00
git	c83a5b989f	Merge branch 'main' into renovate/icr.io-appcafe-open-liberty-25.x	2025-06-05 17:33:26 +02:00
git	c332d80080	Merge pull request 'chore(deps): update module fyne.io/tools to v1.6.1' (#16 ) from renovate/fyne.io-tools-1.x into main Reviewed-on: #16	2025-06-05 17:32:40 +02:00
git	c702dcb009	Merge branch 'main' into renovate/fyne.io-tools-1.x	2025-06-05 17:32:25 +02:00
git	df331da696	Merge pull request 'chore(deps): update dependency org.postgresql:postgresql to v42.7.6' (#14 ) from renovate/postgresql.version into main Reviewed-on: #14	2025-06-05 17:31:50 +02:00
Renovate Bot	851e863d85	chore(deps): update icr.io/appcafe/open-liberty docker tag to v25	2025-06-05 15:00:16 +00:00
Renovate Bot	2c09fd84b1	chore(deps): update module fyne.io/tools to v1.6.1	2025-06-05 13:58:38 +00:00
Renovate Bot	822c137eab	chore(deps): update dependency org.postgresql:postgresql to v42.7.6	2025-06-05 10:52:38 +00:00
git	7ad848f5ce	Merge pull request 'chore(deps): update dependency jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api to v3.0.2' (#5 ) from renovate/jakarta.servlet.jsp.jstl-jakarta.servlet.jsp.jstl-api-3.x into main Reviewed-on: #5	2025-06-05 10:42:29 +02:00
git	891e9235e4	Merge branch 'main' into renovate/jakarta.servlet.jsp.jstl-jakarta.servlet.jsp.jstl-api-3.x	2025-06-05 08:14:05 +02:00
git	f170c89ebc	Merge pull request 'chore(deps): update module fyne.io/fyne/v2 to v2.6.1' (#7 ) from renovate/fyne.io-fyne-v2-2.x into main Reviewed-on: #7	2025-06-05 08:13:55 +02:00
git	7ad5a283a8	Merge branch 'main' into renovate/fyne.io-fyne-v2-2.x	2025-06-05 08:13:44 +02:00
git	eb89238297	Merge pull request 'chore(deps): update module github.com/spf13/viper to v1.20.1' (#8 ) from renovate/github.com-spf13-viper-1.x into main Reviewed-on: #8	2025-06-05 08:13:28 +02:00
git	7c43235120	Merge pull request 'chore(deps): update dependency io.openliberty.tools:liberty-maven-plugin to v3.11.3' (#9 ) from renovate/io.openliberty.tools-liberty-maven-plugin-3.x into main Reviewed-on: #9	2025-06-05 08:13:09 +02:00
git	ef0098ab65	Merge pull request 'chore(deps): update dependency jakarta.websocket:jakarta.websocket-api to v2.2.0' (#10 ) from renovate/jakarta.websocket-jakarta.websocket-api-2.x into main Reviewed-on: #10	2025-06-05 08:12:55 +02:00
git	3a83ffa914	Merge pull request 'chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0' (#11 ) from renovate/org.apache.maven.plugins-maven-compiler-plugin-3.x into main Reviewed-on: #11	2025-06-05 08:12:24 +02:00
git	663268d469	Merge pull request 'chore(deps): update dependency org.apache.maven.plugins:maven-war-plugin to v3.4.0' (#12 ) from renovate/org.apache.maven.plugins-maven-war-plugin-3.x into main Reviewed-on: #12	2025-06-05 08:12:12 +02:00
git	0e373833dd	Merge pull request 'chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.17.final' (#13 ) from renovate/hibernate.version into main Reviewed-on: #13	2025-06-05 08:11:59 +02:00
git	de0223a298	Merge pull request 'chore(deps): update dependency jakarta.json.bind:jakarta.json.bind-api to v3.0.1' (#4 ) from renovate/jakarta.json.bind-jakarta.json.bind-api-3.x into main Reviewed-on: #4	2025-06-05 08:08:35 +02:00
Renovate Bot	914914cd2f	chore(deps): update dependency org.hibernate.orm:hibernate-core to v6.6.17.final	2025-06-05 03:55:26 +00:00
Renovate Bot	bd2abab88e	chore(deps): update dependency org.apache.maven.plugins:maven-war-plugin to v3.4.0	2025-06-05 03:55:23 +00:00
Renovate Bot	6415097740	chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0	2025-06-05 01:32:01 +00:00
Renovate Bot	0ab7c7aa3f	chore(deps): update dependency jakarta.websocket:jakarta.websocket-api to v2.2.0	2025-06-05 01:31:58 +00:00
Renovate Bot	dad67158a6	chore(deps): update dependency io.openliberty.tools:liberty-maven-plugin to v3.11.3	2025-06-04 22:13:17 +00:00
Renovate Bot	100e2b28de	chore(deps): update module github.com/spf13/viper to v1.20.1	2025-06-04 22:13:14 +00:00
Renovate Bot	23de1e244d	chore(deps): update module fyne.io/fyne/v2 to v2.6.1	2025-06-04 21:10:10 +00:00
Renovate Bot	7a45eb3c92	chore(deps): update dependency jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api to v3.0.2	2025-06-04 20:05:23 +00:00
Renovate Bot	6632fca48c	chore(deps): update dependency jakarta.json.bind:jakarta.json.bind-api to v3.0.1	2025-06-04 20:05:21 +00:00
git	77c9cd42cb	Merge pull request 'chore(deps): update dependency jakarta.json:jakarta.json-api to v2.1.3' (#3 ) from renovate/jakarta.json-jakarta.json-api-2.x into main Reviewed-on: #3	2025-06-04 20:11:40 +02:00
git	3c9ad0758b	Merge pull request 'chore(deps): replace dependency org.hibernate:hibernate-core with org.hibernate.orm:hibernate-core' (#2 ) from renovate/org.hibernate-hibernate-core-replacement into main Reviewed-on: #2	2025-06-04 20:11:31 +02:00
Renovate Bot	f37f01308e	chore(deps): update dependency jakarta.json:jakarta.json-api to v2.1.3	2025-06-04 18:02:40 +00:00
Renovate Bot	01fdb7e1e3	chore(deps): replace dependency org.hibernate:hibernate-core with org.hibernate.orm:hibernate-core	2025-06-04 18:02:37 +00:00
git	ff5337c7e7	Merge pull request 'chore: Configure Renovate' (#1 ) from renovate/configure into main Reviewed-on: #1	2025-06-04 19:21:45 +02:00
Renovate Bot	f445c77301	Add renovate.json	2025-06-04 14:57:37 +00:00
Patryk Hegenberg	75b0e7912a	docs: update README	2025-03-30 12:27:58 +02:00
Patryk Hegenberg	a41a262640	docs: update changelog	2025-03-30 12:20:05 +02:00
Pata1704	42cfaed2f9	Update Readme	2025-03-29 18:18:28 +00:00
Pata1704	ff0e2b9890	Update Readme	2025-03-29 18:15:22 +00:00
Patryk Hegenberg	8e48aa6a09	docs: update README	2025-03-29 03:01:34 +01:00
Patryk Hegenberg	3abd4a985a	docs: update changelog.md	2025-03-23 03:01:08 +01:00
Patryk Hegenberg	83ffeb107f	feat: added complete example for spring boot rest service with devcontainer	2025-03-23 03:00:14 +01:00
Patryk Hegenberg	d605c3bd7d	feat: add jakarta rest todo implementation with devcontainer setup	2025-03-23 00:35:03 +01:00
Patryk Hegenberg	b75d5b2d11	docs: update changelog	2025-03-21 20:51:41 +01:00
Patryk Hegenberg	a03f180e43	feat: Add complete example for Jakarta Faces and a devcontainer setup	2025-03-21 20:43:41 +01:00
Patryk Hegenberg	d851c1b628	feat: optimize software installation on windows and add information splash screen on startup	2025-03-21 15:12:48 +01:00
Patryk Hegenberg	111756ffe5	build: add clean up step to build.sh	2025-03-21 11:53:19 +01:00
Patryk Hegenberg	5ac9e64eb5	docs: update changelog	2025-03-21 10:24:07 +01:00
Patryk Hegenberg	3a32b39f3d	feat: finalize jakarta-jsp devcontainer setup	2025-03-21 10:23:34 +01:00
Patryk Hegenberg	acf4e95e08	fix: reorder wsl checks on windows docker installation to reduce executation if elevated privileges	2025-03-21 07:53:09 +01:00
Patryk Hegenberg	18dccf9fb8	feat: improve docker installation process by adding wsl feature activation	2025-03-20 20:59:36 +01:00
Patryk Hegenberg	f1f2a8d2c5	chore: add .devcontainer directory to jakarta jsp project directory	2025-03-20 20:57:45 +01:00
Patryk Hegenberg	c903fa1803	feat: improve usability by including a progressbar while installing packages on windows and mac	2025-03-20 20:16:22 +01:00
Patryk Hegenberg	26bdcd9a6a	fix: disable password dialog on windows	2025-03-20 19:17:22 +01:00
Patryk Hegenberg	4a3fb2be58	fix: reanble window resize to better support multi monitor setups with different resolutions	2025-03-20 19:16:42 +01:00
Patryk Hegenberg	3072446df0	feat: add jakarta-todo-jsp implementation	2025-03-20 17:53:54 +01:00
Patryk Hegenberg	1737be597c	docs: fix missing version info in changelog.md	2025-03-19 22:52:35 +01:00
Patryk Hegenberg	1a082dc606	docs: add changelog.md	2025-03-19 22:48:50 +01:00
Patryk Hegenberg	04ecd56598	feat: add first simple jakartaee10-servlet project jakarta project has to be cleaned up and some smaller errors have to be fixed	2025-03-19 22:48:03 +01:00
Patryk Hegenberg	fe83dc1f33	feat: add config and structured logging	2025-03-19 21:58:39 +01:00
Patryk Hegenberg	902a8bb7d1	feat: add simple spring-boot-todo-microservice Added first iterateion of a spring-boot todo rest microservice. This has to be finished to support devcontainers.	2025-03-17 07:00:54 +01:00