diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 15486c1..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.settings/ -MacOSX11.3.sdk -MacOSX11.3.sdk.tar.xz -packages diff --git a/FyneApp.toml b/FyneApp.toml deleted file mode 100644 index ef1a5d8..0000000 --- a/FyneApp.toml +++ /dev/null @@ -1,6 +0,0 @@ -[Default] -Icon = "Icon.png" -Name = "JavaWebStarter" -ID = "com.hegenberg.app" -Version = "0.0.1" -Build = 1 diff --git a/Icon.png b/Icon.png deleted file mode 100644 index b978900..0000000 Binary files a/Icon.png and /dev/null differ diff --git a/README.md b/README.md index 7a9f5bd..d246114 100644 --- a/README.md +++ b/README.md @@ -1,177 +1,103 @@ -# Java Web Starter (JWS) - University Project Environment Initializer +# JakartaEE & Spring Boot Starter -[![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.** +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. -## Inhaltsverzeichnis +## Features -- [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) +- _Dependency Check_: Verifies the installation of required tools (Visual Studio Code and Docker). -## Motivation / Problemstellung +- _Automatic Installation_: Offers to install missing dependencies on supported platforms. -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 Selection_: Provides a list of starter projects for JakartaEE and Spring Boot. -## Lösungsansatz +- _Project Deployment_: Allows users to deploy selected projects and open them in Visual Studio Code with dev containers. -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. +## Prerequisites -Das Tool wurde in **Go** mit dem **Fyne** GUI-Toolkit entwickelt, um native Ausführbarkeit unter Windows, macOS und Linux zu gewährleisten +- Go 1.23 or later -## 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. +- Fyne v2.5.4 ## Installation -### Voraussetzungen +### Option 1: Download Pre-built Binary -- 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. +Go to the Releases page of this repository. -### Über Releases (Empfohlen) +Download the appropriate binary for your operating system. -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. +### Option 2: Build from Source -### Aus dem Quellcode bauen +- Clone the repository: -1. Klonen Sie das Repository: - ```bash - git clone https://codeberg.org/Pata1704/jws_gui.git - cd jws_gui - ``` -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 build . - ``` - Dies erstellt die ausführbare Datei `jws` (oder `jws.exe` unter Windows) im aktuellen Verzeichnis. +```bash +git clone https://github.com/yourusername/jws_gui.git +``` -## Benutzung +Navigate to the project directory: -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 - 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. +```bash +cd jws_gui +``` -Sie haben nun eine funktionierende, containerisierte Entwicklungsumgebung, ohne sich manuell um Installationen oder Konfigurationen kümmern zu müssen! +Install dependencies: -## Enthaltene Projekt-Templates +The list of dependencies required for the development of Fyne Apps can be found at “https://docs.fyne.io/started/”. -Aktuell sind folgende Templates enthalten: +```bash +go mod tidy +``` -1. Jakarta EE mit Servlet/JSP -2. Jakarta EE mit JSF -3. Jakarta EE mit REST (JAX-RS) -4. Spring Boot mit REST +Build the application: -Alle Templates beinhalten eine PostgreSQL-Datenbankanbindung via Hibernate/JPA. +```bash +go build +``` -## Funktionsweise (Dev Container) +## Usage -Der Kern der Standardisierung basiert auf dem **Dev Container Standard**: +Run the application: -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. +If you downloaded a pre-built binary: -Dies stellt sicher, dass alle Nutzer exakt die gleiche Umgebung mit den richtigen Werkzeugversionen und Abhängigkeiten haben, unabhängig von ihrem lokalen System. +```bash +./jakartaee-springboot-starter +``` -## Bekannte Probleme / Limitationen +or by double-clicking the excutable. -- **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 +If you built from source: -## Zukünftige Arbeit / Ausblick +```bash +./jakartaee-springboot-starter +``` -- 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 +The application will launch a GUI window where you can: -## Beitragen +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. -Beiträge sind willkommen! +## Project Structure -## Software Bill of Materials (SBOM) -Das SBOM dieses Projekts finden Sie unter [sbom.json](sbom.json). +_TODO_ -## Lizenz +## Customization -Dieses Projekt ist lizenziert unter der MIT Lizenz +To add new starter projects: -## Danksagung +1. Create a new project template in the projects/ directory. +2. Add the project details to the projects.json file. -- 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. . +## Contributing + +Contributions are welcome! Please feel free to submit a Pull Request. + +License +[Insert your chosen license here] + +## Acknowledgments + +- Fyne: https://fyne.io/ +- JakartaEE: https://jakarta.ee/ +- Spring Boot: https://spring.io/projects/spring-boot diff --git a/build.sh b/build.sh deleted file mode 100755 index 31b7071..0000000 --- a/build.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/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/ diff --git a/changelog.md b/changelog.md deleted file mode 100644 index 34fd84f..0000000 --- a/changelog.md +++ /dev/null @@ -1,96 +0,0 @@ -# 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 - - diff --git a/cmd/jws/Icon.png b/cmd/jws/Icon.png index b978900..b9c666c 100644 Binary files a/cmd/jws/Icon.png and b/cmd/jws/Icon.png differ diff --git a/cmd/jws/main.go b/cmd/jws/main.go index e7737e9..8588067 100644 --- a/cmd/jws/main.go +++ b/cmd/jws/main.go @@ -1,24 +1,19 @@ +// 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 @@ -31,78 +26,23 @@ 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 Server Faces", - Description: "Eine Todo-Anwendung mit Jakarta Faces und\nPostgreSQL-Datenbank.", - FolderName: "jakarta-faces-todo", + 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 JSP", @@ -121,7 +61,8 @@ func createMainWindow(a fyne.App, config *config.Config) { }, } - pluginProjects, err := loadProjects(filepath.Join(config.ProjectsPath, "projects.json")) + // Load additional projects from projects.json + pluginProjects, err := loadProjects("projects.json") if err != nil { dialog.ShowError(fmt.Errorf("error loading projects: %v", err), mainWindow) return @@ -129,9 +70,10 @@ func createMainWindow(a fyne.App, config *config.Config) { 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 { @@ -141,13 +83,14 @@ func createMainWindow(a fyne.App, config *config.Config) { } } + // Show appropriate screen if allInstalled { gui.ShowProjectScreen() } else { gui.ShowDependencyScreen() } - mainWindow.Show() + mainWindow.ShowAndRun() } func loadProjects(filePath string) ([]project.Project, error) { diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.dockerignore b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.dockerignore deleted file mode 100644 index 017b280..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -.git -.github -.settings -target -*.iml -.idea -.vscode -node_modules diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.gitignore b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.gitignore deleted file mode 100644 index 82b069a..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -# 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/ diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile deleted file mode 100644 index d09e6f2..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile.dev b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile.dev deleted file mode 100644 index 412eb57..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/Dockerfile.dev +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/devcontainer.json b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/devcontainer.json deleted file mode 100644 index a1901d5..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/devcontainer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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"} -} -} diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/docker-compose.yml b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/docker-compose.yml deleted file mode 100644 index 3141d45..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,60 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/init.sql b/cmd/jws/projects/jakarta-faces-todo/.devcontainer/init.sql deleted file mode 100644 index 9d98295..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/.devcontainer/init.sql +++ /dev/null @@ -1,17 +0,0 @@ -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) -); - diff --git a/cmd/jws/projects/jakarta-faces-todo/pom.xml b/cmd/jws/projects/jakarta-faces-todo/pom.xml deleted file mode 100644 index d7f9f9d..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - 4.0.0 - - com.todoapp - todo-app - 1.0-SNAPSHOT - war - - - UTF-8 - 17 - 17 - 10.0.0 - 6.6.22.Final - 42.7.6 - - - - - - jakarta.platform - jakarta.jakartaee-api - ${jakartaee.version} - provided - - - - - org.hibernate.orm - hibernate-core - ${hibernate.version} - - - - - org.postgresql - postgresql - ${postgresql.version} - - - - - - jakarta.websocket - jakarta.websocket-api - 2.2.0 - provided - - - - - org.hibernate.orm - hibernate-core - 7.0.0.Final - - - - at.favre.lib - bcrypt - 0.10.2 - - - - - todo-app - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - - - io.openliberty.tools - liberty-maven-plugin - 3.11.4 - - - - diff --git a/cmd/jws/projects/jakarta-faces-todo/server.xml b/cmd/jws/projects/jakarta-faces-todo/server.xml deleted file mode 100644 index 56b007e..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/server.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - servlet-6.0 - pages-3.1 - jdbc-4.2 - jndi-1.0 - monitor-1.0 - faces-4.0 - - - - - - - - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 4964df7..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/AuthBean.java +++ /dev/null @@ -1,133 +0,0 @@ -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; - } -} diff --git 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 deleted file mode 100644 index 5b9302d..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/TodoBean.java +++ /dev/null @@ -1,112 +0,0 @@ -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 todos; - - public String saveOrUpdateTodo() { - if (todo.getId() == null) { - return saveTodo(); - } else { - return updateTodo(); - } - } - - public List getTodosByUser(Long userId) { - if (todos == null) { - todos = todoDAO.getTodosByUser(userId); - } - return todos; - } - - public List getTodosByUser() { - User user = (User) FacesContext.getCurrentInstance() - .getExternalContext() - .getSessionMap() - .get("user"); - System.out.println("Fetching todos for user ID: " + user.getId()); - List 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; - } -} diff --git 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 deleted file mode 100644 index 0d21d99..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/bean/UserBean.java +++ /dev/null @@ -1,43 +0,0 @@ -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 users; - - public List 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; - } -} diff --git 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 deleted file mode 100644 index 91ebf81..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/TodoDAO.java +++ /dev/null @@ -1,134 +0,0 @@ -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 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 getTodosByUser(Long userId) { - try ( - Session session = HibernateUtil.getSessionFactory().openSession() - ) { - Query 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 getCompletedTodosByUser(Long userId) { - try ( - Session session = HibernateUtil.getSessionFactory().openSession() - ) { - Query 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 getIncompleteTodosByUser(Long userId) { - try ( - Session session = HibernateUtil.getSessionFactory().openSession() - ) { - Query 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(); - } - } -} diff --git 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 deleted file mode 100644 index 435da9e..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/dao/UserDAO.java +++ /dev/null @@ -1,136 +0,0 @@ -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 getUserByUsername(String username) { - try ( - Session session = HibernateUtil.getSessionFactory().openSession() - ) { - Query 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 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 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 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; - } - } -} diff --git 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 deleted file mode 100644 index 88fd60b..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/Todo.java +++ /dev/null @@ -1,110 +0,0 @@ -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 + - '}' - ); - } -} diff --git 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 deleted file mode 100644 index 3938f64..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/model/User.java +++ /dev/null @@ -1,98 +0,0 @@ -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 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 getTodos() { - return todos; - } - - public void setTodos(List 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 + '\'' + - '}'; - } -} diff --git 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 deleted file mode 100644 index 49b8cb3..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/AuthFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -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 - } -} diff --git 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 deleted file mode 100644 index e868bc6..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/java/com/todoapp/util/HibernateUtil.java +++ /dev/null @@ -1,109 +0,0 @@ -//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(); - } - } -} diff --git 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 deleted file mode 100644 index 39dda78..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/liberty/config/server.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - servlet-6.0 - pages-3.1 - jdbc-4.2 - jndi-1.0 - monitor-1.0 - faces-4.0 - websocket-2.1 - - - - - - - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 1e6b316..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.hibernate.jpa.HibernatePersistenceProvider - com.todoapp.model.User - com.todoapp.model.Todo - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 33bdd20..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - jdbc/PostgresDataSource - - - org.hibernate.dialect.PostgreSQLDialect - - - true - - - thread - - - update - - - - - - diff --git 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 deleted file mode 100644 index 49adde1..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git 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 deleted file mode 100644 index 687074e..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - Todo Application - - - login.xhtml - - - - Faces Servlet - jakarta.faces.webapp.FacesServlet - 1 - - - - Faces Servlet - *.xhtml - - - - jakarta.faces.PROJECT_STAGE - Development - - - - 404 - /error.xhtml - - - - 500 - /error.xhtml - - - - 30 - - - diff --git a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/error.xhtml b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/error.xhtml deleted file mode 100644 index 8f9ae9f..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/error.xhtml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Fehler - - - -
-

Oops! Es ist ein Fehler aufgetreten

- -
-

Etwas ist schiefgelaufen. Bitte versuchen Sie es später erneut.

-

Fehlercode: #{facesContext.externalContext.responseStatusCode}

-
- -
- -
-
- - diff --git a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/login.xhtml b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/login.xhtml deleted file mode 100644 index 5575a23..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/login.xhtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Login - - - -
-

Login

- - - - -
- - -
- -
- - -
- -
- -
- - -

Noch keinen Account?

-
- - diff --git a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/register.xhtml b/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/register.xhtml deleted file mode 100644 index d2acf85..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/register.xhtml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - Registrierung - - - -
-

Registrierung

- - - - -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
- - -

Bereits registriert?

-
- - diff --git 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 deleted file mode 100644 index 1de9c26..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/resources/css/style.css +++ /dev/null @@ -1,246 +0,0 @@ -/* 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; -} diff --git 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 deleted file mode 100644 index 929a611..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-form.xhtml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - #{todoBean.todo.id == null ? 'Neue Aufgabe' : 'Aufgabe bearbeiten'} - - - -
-

#{todoBean.todo.id == null ? 'Neue Aufgabe' : 'Aufgabe bearbeiten'}

- - - - -
- - -
- -
- - -
- -
- - - - -
- -
- - -
- -
- - diff --git 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 deleted file mode 100644 index 109325f..0000000 --- a/cmd/jws/projects/jakarta-faces-todo/src/main/webapp/todo-list.xhtml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - Meine Aufgaben - - - -
-
-

Meine Aufgaben

- -
- -
- -
- - -
-

Keine Aufgaben vorhanden. Erstellen Sie eine neue Aufgabe!

-
- - - - - Titel - #{todo.title} - - - Beschreibung - #{todo.description} - - - Fälligkeitsdatum - - - - - - Status - - - - - Aktionen - - - - - - - - - -
- - diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.dockerignore b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.dockerignore deleted file mode 100644 index 017b280..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -.git -.github -.settings -target -*.iml -.idea -.vscode -node_modules diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.gitignore b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.gitignore deleted file mode 100644 index 82b069a..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -# 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/ diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile deleted file mode 100644 index d09e6f2..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile.dev b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile.dev deleted file mode 100644 index 412eb57..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile.dev +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/devcontainer.json b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/devcontainer.json deleted file mode 100644 index a1901d5..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/devcontainer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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"} -} -} diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml deleted file mode 100644 index 3141d45..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,60 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql deleted file mode 100644 index 9d98295..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql +++ /dev/null @@ -1,17 +0,0 @@ -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) -); - diff --git a/cmd/jws/projects/jakarta-jsp-todo/pom.xml b/cmd/jws/projects/jakarta-jsp-todo/pom.xml index b4a19fb..e69de29 100644 --- a/cmd/jws/projects/jakarta-jsp-todo/pom.xml +++ b/cmd/jws/projects/jakarta-jsp-todo/pom.xml @@ -1,89 +0,0 @@ - - - 4.0.0 - - com.todoapp - todo-app - 1.0-SNAPSHOT - war - - - UTF-8 - 17 - 17 - 10.0.0 - 6.6.22.Final - 42.7.6 - - - - - - jakarta.platform - jakarta.jakartaee-api - ${jakartaee.version} - provided - - - - - org.hibernate.orm - hibernate-core - ${hibernate.version} - - - - - org.postgresql - postgresql - ${postgresql.version} - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - 3.0.2 - - - org.glassfish.web - jakarta.servlet.jsp.jstl - 3.0.1 - - - - org.hibernate.orm - hibernate-core - 7.0.0.Final - - - - at.favre.lib - bcrypt - 0.10.2 - - - - - todo-app - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - - - io.openliberty.tools - liberty-maven-plugin - 3.11.4 - - - - diff --git a/cmd/jws/projects/jakarta-jsp-todo/server.xml b/cmd/jws/projects/jakarta-jsp-todo/server.xml deleted file mode 100644 index 92a8bd8..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/server.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - servlet-6.0 - pages-3.1 - jdbc-4.2 - jndi-1.0 - monitor-1.0 - - - - - - - - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 82c6107..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/TodoDAO.java +++ /dev/null @@ -1,111 +0,0 @@ -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 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 getTodosByUser(Long userId) { - try (Session session = HibernateUtil.getSessionFactory().openSession()) { - Query 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 getCompletedTodosByUser(Long userId) { - try (Session session = HibernateUtil.getSessionFactory().openSession()) { - Query 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 getIncompleteTodosByUser(Long userId) { - try (Session session = HibernateUtil.getSessionFactory().openSession()) { - Query 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(); - } - } -} diff --git 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 deleted file mode 100644 index eba60fc..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/dao/UserDAO.java +++ /dev/null @@ -1,112 +0,0 @@ -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 getUserByUsername(String username) { - try (Session session = HibernateUtil.getSessionFactory().openSession()) { - Query 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 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 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 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; - } - } -} diff --git 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 deleted file mode 100644 index a240a0c..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/Todo.java +++ /dev/null @@ -1,99 +0,0 @@ -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 + - '}'; - } -} diff --git 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 deleted file mode 100644 index 3938f64..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/model/User.java +++ /dev/null @@ -1,98 +0,0 @@ -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 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 getTodos() { - return todos; - } - - public void setTodos(List 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 + '\'' + - '}'; - } -} diff --git 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 deleted file mode 100644 index ad24e4c..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/AuthServlet.java +++ /dev/null @@ -1,154 +0,0 @@ -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 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"); - } -} diff --git 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 deleted file mode 100644 index 5426464..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/TodoServlet.java +++ /dev/null @@ -1,182 +0,0 @@ -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 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"); - } -} diff --git 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 deleted file mode 100644 index c7806c4..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/servlet/UserServlet.java +++ /dev/null @@ -1,73 +0,0 @@ -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 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 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"); - } -} diff --git 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 deleted file mode 100644 index 49b8cb3..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/AuthFilter.java +++ /dev/null @@ -1,44 +0,0 @@ -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 - } -} diff --git 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 deleted file mode 100644 index e868bc6..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java +++ /dev/null @@ -1,109 +0,0 @@ -//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(); - } - } -} diff --git 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 deleted file mode 100644 index f834402..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/liberty/config/server.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - servlet-6.0 - pages-3.1 - jdbc-4.2 - jndi-1.0 - monitor-1.0 - - - - - - - - - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 1e6b316..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.hibernate.jpa.HibernatePersistenceProvider - com.todoapp.model.User - com.todoapp.model.Todo - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 33bdd20..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - jdbc/PostgresDataSource - - - org.hibernate.dialect.PostgreSQLDialect - - - true - - - thread - - - update - - - - - - diff --git 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 deleted file mode 100644 index 9fe71a3..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - Todo Application - - - auth/login - - - - 404 - /error.jsp - - - - 500 - /error.jsp - - - - 30 - - - diff --git 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 deleted file mode 100644 index 1de9c26..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/css/style.css +++ /dev/null @@ -1,246 +0,0 @@ -/* 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; -} diff --git a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/error.jsp b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/error.jsp deleted file mode 100644 index a032cd1..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/error.jsp +++ /dev/null @@ -1,23 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isErrorPage="true" %> - - - - - Fehler - - - -
-

Oops! Es ist ein Fehler aufgetreten

- -
-

Etwas ist schiefgelaufen. Bitte versuchen Sie es später erneut.

-

Fehlercode: ${pageContext.errorData.statusCode}

-
- -
- Zurück zur Startseite -
-
- - diff --git a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/login.jsp b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/login.jsp deleted file mode 100644 index 5a5ae08..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/login.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> - - - - - Login - - - -
-

Login

- - -
-

${errorMessage}

-
- - - -
-

${successMessage}

-
- - -
-
- - -
- -
- - -
- -
- -
-
- -

Noch keinen Account? Registrieren

-
- - diff --git a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/register.jsp b/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/register.jsp deleted file mode 100644 index 496fba3..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/register.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> - - - - - Registrierung - - - -
-

Registrierung

- - -
-

${errorMessage}

-
- - -
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- -
-
- -

Bereits registriert? Anmelden

-
- - diff --git 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 deleted file mode 100644 index 86afc63..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-form.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> - - - - - ${todo != null ? 'Aufgabe bearbeiten' : 'Neue Aufgabe'} - - - -
-

${todo != null ? 'Aufgabe bearbeiten' : 'Neue Aufgabe'}

- -
- - - - -
- - -
- -
- - -
- -
- - -
- -
- - Abbrechen -
-
-
- - diff --git 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 deleted file mode 100644 index e0539c0..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/webapp/todo-list.jsp +++ /dev/null @@ -1,80 +0,0 @@ -<%@ 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"%> - - - - - Meine Aufgaben - - - -
-
-

Meine Aufgaben

- -
- -
- Neue Aufgabe -
- - - -
-

Keine Aufgaben vorhanden. Erstellen Sie eine neue Aufgabe!

-
- - - - - - - - - - - - - - - - - - - - - - - -
TitelBeschreibungFälligkeitsdatumStatusAktionen
${todo.title}${todo.description}${todo.targetDate} - - - Erledigt - - - Offen - - - - Bearbeiten - Löschen - - - - Als offen markieren - - - Als erledigt markieren - - - -
- - -
- - diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.dockerignore b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.dockerignore deleted file mode 100644 index 017b280..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -.git -.github -.settings -target -*.iml -.idea -.vscode -node_modules diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.gitignore b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.gitignore deleted file mode 100644 index 82b069a..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -# 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/ diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile deleted file mode 100644 index d09e6f2..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile.dev b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile.dev deleted file mode 100644 index 412eb57..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/Dockerfile.dev +++ /dev/null @@ -1,14 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/devcontainer.json b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/devcontainer.json deleted file mode 100644 index a1901d5..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/devcontainer.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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"} -} -} diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/docker-compose.yml b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/docker-compose.yml deleted file mode 100644 index 3141d45..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/docker-compose.yml +++ /dev/null @@ -1,60 +0,0 @@ -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 diff --git a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/init.sql b/cmd/jws/projects/jakarta-rest-todo/.devcontainer/init.sql deleted file mode 100644 index 818eadb..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/.devcontainer/init.sql +++ /dev/null @@ -1,19 +0,0 @@ -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'); diff --git a/cmd/jws/projects/jakarta-rest-todo/pom.xml b/cmd/jws/projects/jakarta-rest-todo/pom.xml index abcac9c..e69de29 100644 --- a/cmd/jws/projects/jakarta-rest-todo/pom.xml +++ b/cmd/jws/projects/jakarta-rest-todo/pom.xml @@ -1,112 +0,0 @@ - - - 4.0.0 - - com.todoapp - todo-app - 1.0-SNAPSHOT - war - - - UTF-8 - 17 - 17 - 10.0.0 - 6.6.22.Final - 42.7.6 - - - - - - jakarta.platform - jakarta.jakartaee-api - ${jakartaee.version} - provided - - - - - org.hibernate.orm - hibernate-core - ${hibernate.version} - - - - - org.postgresql - postgresql - ${postgresql.version} - - - - - jakarta.servlet.jsp.jstl - jakarta.servlet.jsp.jstl-api - 3.0.2 - - - org.glassfish.web - jakarta.servlet.jsp.jstl - 3.0.1 - - - - - jakarta.ws.rs - jakarta.ws.rs-api - 3.1.0 - provided - - - - - jakarta.json.bind - jakarta.json.bind-api - 3.0.1 - provided - - - - - jakarta.json - jakarta.json-api - 2.1.3 - provided - - - org.hibernate.orm - hibernate-core - 7.0.0.Final - - - - at.favre.lib - bcrypt - 0.10.2 - - - - - todo-app - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.0 - - - org.apache.maven.plugins - maven-war-plugin - 3.4.0 - - - io.openliberty.tools - liberty-maven-plugin - 3.11.4 - - - - diff --git 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 deleted file mode 100644 index 45d5557..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/TodoDAO.java +++ /dev/null @@ -1,135 +0,0 @@ -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 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 getTodosByUsername(String username) { - try (Session session = sessionFactory.openSession()) { - Query 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 getCompletedTodosByUsername(String username) { - try (Session session = sessionFactory.openSession()) { - Query 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 getIncompleteTodosByUsername(String username) { - try (Session session = sessionFactory.openSession()) { - Query 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); - } - } -} diff --git 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 deleted file mode 100644 index 3893bb7..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dao/UserDAO.java +++ /dev/null @@ -1,124 +0,0 @@ -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 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 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 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 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); - } - } -} diff --git 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 deleted file mode 100644 index 5608a6e..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/LoginRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - } -} diff --git 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 deleted file mode 100644 index 04561ec..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java +++ /dev/null @@ -1,32 +0,0 @@ -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; - } -} diff --git 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 deleted file mode 100644 index 18560e4..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/Todo.java +++ /dev/null @@ -1,109 +0,0 @@ -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 + - '}'; - } -} diff --git 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 deleted file mode 100644 index e530617..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/model/User.java +++ /dev/null @@ -1,101 +0,0 @@ -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 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 getTodos() { - return todos; - } - - public void setTodos(List 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 + '\'' + - '}'; - } -} diff --git 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 deleted file mode 100644 index 1e8a901..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/AuthResource.java +++ /dev/null @@ -1,95 +0,0 @@ -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(); - } -} diff --git 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 deleted file mode 100644 index 6ab8ce0..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoApplication.java +++ /dev/null @@ -1,9 +0,0 @@ -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 -} diff --git 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 deleted file mode 100644 index 9e0575f..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/rest/TodoResource.java +++ /dev/null @@ -1,130 +0,0 @@ -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 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 todos = todoDAO.getCompletedTodosByUsername(username); - return Response.ok(todos).build(); - } - - @GET - @Path("/incomplete") - public Response getIncompleteTodos(@Context SecurityContext securityContext) { - String username = securityContext.getUserPrincipal().getName(); - List 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(); - } -} diff --git 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 deleted file mode 100644 index 6d4f104..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/BasicAuthenticationFilter.java +++ /dev/null @@ -1,104 +0,0 @@ -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()); - } -} diff --git 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 deleted file mode 100644 index b08586a..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/security/CORSFilter.java +++ /dev/null @@ -1,20 +0,0 @@ -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"); - } -} diff --git 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 deleted file mode 100644 index 2ddaaf2..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/java/com/todoapp/util/HibernateUtil.java +++ /dev/null @@ -1,41 +0,0 @@ -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(); - } - } -} diff --git 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 deleted file mode 100644 index f281c16..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/liberty/config/server.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - servlet-6.0 - pages-3.1 - jdbc-4.2 - jndi-1.0 - monitor-1.0 - restfulWS-3.1 - jsonb-3.0 - jsonp-2.1 - - transportSecurity-1.0 - - - - - - - - - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 1e6b316..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.hibernate.jpa.HibernatePersistenceProvider - com.todoapp.model.User - com.todoapp.model.Todo - - - - - - - - - - - diff --git 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 deleted file mode 100644 index 33bdd20..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - jdbc/PostgresDataSource - - - org.hibernate.dialect.PostgreSQLDialect - - - true - - - thread - - - update - - - - - - diff --git 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 deleted file mode 100644 index 80ab99b..0000000 --- a/cmd/jws/projects/jakarta-rest-todo/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - Todo Application - - - 30 - - diff --git a/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/Dockerfile b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/Dockerfile new file mode 100644 index 0000000..88ce4c6 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/Dockerfile @@ -0,0 +1,18 @@ +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"] diff --git a/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/devcontainer.json b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/devcontainer.json new file mode 100644 index 0000000..3fc9403 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/devcontainer.json @@ -0,0 +1,9 @@ +{ + "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" +} diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/docker-compose.yml b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/docker-compose.yml similarity index 55% rename from cmd/jws/projects/spring-boot-todo/.devcontainer/docker-compose.yml rename to cmd/jws/projects/jakarta-servlet-todo/.devcontainer/docker-compose.yml index c7078c7..96374b2 100644 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/docker-compose.yml +++ b/cmd/jws/projects/jakarta-servlet-todo/.devcontainer/docker-compose.yml @@ -1,21 +1,24 @@ +version: "3.8" + +volumes: + postgres-data: + services: app: container_name: javadev build: - context: ../ - dockerfile: .devcontainer/Dockerfile.dev - volumes: - - ../..:/workspaces:cached - - ./app:/app + context: . + dockerfile: Dockerfile environment: - POSTGRES_HOST: postgresdb - POSTGRES_PORT: 5432 - POSTGRES_DB: postgres - POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres - networks: - - my_network + POSTGRES_USER: postgres + POSTGRES_DB: postgres + POSTGRES_HOSTNAME: postgresdb + volumes: + - ..:/workspace command: sleep infinity + network_mode: service:db + stdin_open: true db: container_name: postgresdb @@ -23,17 +26,7 @@ services: 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 + POSTGRES_DB: postgres diff --git a/cmd/jws/projects/jakarta-servlet-todo/pom.xml b/cmd/jws/projects/jakarta-servlet-todo/pom.xml new file mode 100644 index 0000000..f4e6fc5 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + + com.example + jakarta-servlet-todo + 1.0-SNAPSHOT + war + + + 11 + 11 + 10.0.0 + 6.0.0.Final + 42.3.1 + + + + + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.version} + provided + + + org.hibernate.orm + hibernate-core + ${hibernate.version} + + + org.postgresql + postgresql + ${postgresql.version} + + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + + + diff --git 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 new file mode 100644 index 0000000..1006346 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/dao/TodoDAO.java @@ -0,0 +1,36 @@ +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 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); + } + } +} diff --git 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 new file mode 100644 index 0000000..49572c3 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/model/Todo.java @@ -0,0 +1,43 @@ +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; + } +} diff --git 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 new file mode 100644 index 0000000..ae8b325 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/java/com/example/servlet/TodoServlet.java @@ -0,0 +1,40 @@ +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 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"); + } +} diff --git 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 new file mode 100644 index 0000000..3e553ee --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,19 @@ + + + + com.example.model.Todo + + + + + + + + + + + + diff --git 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 new file mode 100644 index 0000000..1a8fbb4 --- /dev/null +++ b/cmd/jws/projects/jakarta-servlet-todo/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,9 @@ + + + JakartaEE Todo App + + + diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/.dockerignore b/cmd/jws/projects/spring-boot-todo/.devcontainer/.dockerignore deleted file mode 100644 index 017b280..0000000 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -.git -.github -.settings -target -*.iml -.idea -.vscode -node_modules diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/.gitignore b/cmd/jws/projects/spring-boot-todo/.devcontainer/.gitignore deleted file mode 100644 index 82b069a..0000000 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -# 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/ diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/Dockerfile.dev b/cmd/jws/projects/spring-boot-todo/.devcontainer/Dockerfile.dev deleted file mode 100644 index 4fc5dbe..0000000 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/Dockerfile.dev +++ /dev/null @@ -1,15 +0,0 @@ -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"] - diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/devcontainer.json b/cmd/jws/projects/spring-boot-todo/.devcontainer/devcontainer.json deleted file mode 100644 index 49af787..0000000 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/devcontainer.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "Java & PostgreSQL", - "dockerComposeFile": "docker-compose.yml", - "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", - "forwardPorts": [9080, 5432], - "postCreateCommand": "mvn clean install -DskipTests", - "remoteUser": "vscode", - "features": { - "ghcr.io/devcontainers-extra/features/maven-sdkman:2": { - "version": "latest" - }, - "ghcr.io/devcontainers/features/git:1": { "version": "latest" } - } -} diff --git a/cmd/jws/projects/spring-boot-todo/.devcontainer/init.sql b/cmd/jws/projects/spring-boot-todo/.devcontainer/init.sql deleted file mode 100644 index 818eadb..0000000 --- a/cmd/jws/projects/spring-boot-todo/.devcontainer/init.sql +++ /dev/null @@ -1,19 +0,0 @@ -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'); diff --git a/cmd/jws/projects/spring-boot-todo/Dockerfile b/cmd/jws/projects/spring-boot-todo/Dockerfile new file mode 100644 index 0000000..f002fa2 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/Dockerfile @@ -0,0 +1,24 @@ +FROM maven:3.9-eclipse-temurin-17 as builder + +WORKDIR /app +COPY . . +# RUN mvn clean package + +# Baue die Anwendung mit Maven +RUN mvn clean install -DskipTests + +# Verwende ein schlankes OpenJDK-Image für die Ausführung +FROM openjdk:17-jdk-slim + +# Setze das Arbeitsverzeichnis im Container +WORKDIR /app + +# Kopiere die JAR-Datei aus dem Builder-Image +COPY --from=builder /app/target/*.jar app.jar + +# Mache Port 8080 im Container verfügbar (oder den Port, den deine Anwendung verwendet) +EXPOSE 8090 + +# Definiere den Befehl zum Ausführen der Anwendung +ENTRYPOINT ["java", "-jar", "app.jar"] + diff --git a/cmd/jws/projects/spring-boot-todo/compose.yaml b/cmd/jws/projects/spring-boot-todo/compose.yaml new file mode 100644 index 0000000..02856b5 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/compose.yaml @@ -0,0 +1,36 @@ +version: "3.8" +services: + db: + image: postgres:latest + container_name: todolist-db + restart: unless-stopped + environment: + POSTGRES_DB: todolist + POSTGRES_USER: myuser + POSTGRES_PASSWORD: mypassword + ports: + - "5432:5432" + volumes: + - db_data:/var/lib/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U myuser -d todolist"] + interval: 10s + timeout: 5s + retries: 5 + + app: + build: . + container_name: todo-spring-app + ports: + - "8090:8090" + depends_on: + db: + condition: service_healthy + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/todolist + SPRING_DATASOURCE_USERNAME: myuser + SPRING_DATASOURCE_PASSWORD: mypassword + restart: unless-stopped + +volumes: + db_data: diff --git a/cmd/jws/projects/spring-boot-todo/mvnw b/cmd/jws/projects/spring-boot-todo/mvnw new file mode 100755 index 0000000..19529dd --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/cmd/jws/projects/spring-boot-todo/mvnw.cmd b/cmd/jws/projects/spring-boot-todo/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/cmd/jws/projects/spring-boot-todo/pom.xml b/cmd/jws/projects/spring-boot-todo/pom.xml index a490b5c..d8de2b7 100644 --- a/cmd/jws/projects/spring-boot-todo/pom.xml +++ b/cmd/jws/projects/spring-boot-todo/pom.xml @@ -1,87 +1,63 @@ - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.2.0 - - - com.todoapp - spring-todo-app - 0.0.1-SNAPSHOT - spring-todo-app - Spring Boot Todo App - - - 17 - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - org.springframework.boot - spring-boot-starter-security - - - - - org.postgresql - postgresql - runtime - - - - - at.favre.lib - bcrypt - 0.10.2 - - - - - org.springframework.boot - spring-boot-starter-json - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.4.3 + + + com.example + todo-spring + 0.0.1-SNAPSHOT + todo-spring + Demo Todo App for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/TodoSpringApplication.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/TodoSpringApplication.java new file mode 100644 index 0000000..d97a5d3 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/TodoSpringApplication.java @@ -0,0 +1,13 @@ +package com.example.todo_spring; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TodoSpringApplication { + + public static void main(String[] args) { + SpringApplication.run(TodoSpringApplication.class, args); + } + +} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/controllers/TaskController.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/controllers/TaskController.java new file mode 100644 index 0000000..c6a7593 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/controllers/TaskController.java @@ -0,0 +1,50 @@ +package com.example.todo_spring.controllers; + +import com.example.todo_spring.models.Task; +import com.example.todo_spring.services.TaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequestMapping("/api/v1/tasks") +public class TaskController { + + @Autowired + private TaskService taskService; + + @GetMapping("/") + public ResponseEntity> getAllTasks() { + return ResponseEntity.ok(taskService.getAllTask()); + } + + @GetMapping("/completed") + public ResponseEntity> getAllCompletedTasks() { + return ResponseEntity.ok(taskService.findAllCompletedTask()); + } + + @GetMapping("/incomplete") + public ResponseEntity> getAllIncompleteTasks() { + return ResponseEntity.ok(taskService.findAllInCompleteTask()); + } + + @PostMapping("/") + public ResponseEntity createTask(@RequestBody Task task) { + return ResponseEntity.ok(taskService.createNewTask(task)); + } + + @PutMapping("/{id}") + public ResponseEntity updateTask(@PathVariable Long id, @RequestBody Task task) { + task.setId(id); + return ResponseEntity.ok(taskService.updateTask(task)); + } + + @DeleteMapping("/{id}") + public ResponseEntity getAllTasks(@PathVariable Long id) { + taskService.deleteTaskById(id); + return ResponseEntity.ok(true); + } +} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/models/Task.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/models/Task.java new file mode 100644 index 0000000..a2565e6 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/models/Task.java @@ -0,0 +1,46 @@ +package com.example.todo_spring.models; + +import jakarta.persistence.*; + +@Entity +public class Task { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String task; + private boolean completed; + + public Task(String task, boolean completed) { + this.task = task; + this.completed = completed; + } + + public Task() { + this.task = ""; + this.completed = false; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getTask() { + return task; + } + + public void setTask(String task) { + this.task = task; + } + + public boolean isCompleted() { + return completed; + } + + public void setCompleted(boolean completed) { + this.completed = completed; + } +} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/repositories/TaskRepository.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/repositories/TaskRepository.java new file mode 100644 index 0000000..be73235 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/repositories/TaskRepository.java @@ -0,0 +1,20 @@ +package com.example.todo_spring.repositories; + +import com.example.todo_spring.models.Task; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface TaskRepository extends JpaRepository { + public Task findByTask(String task); + + public List findByCompletedTrue(); + + public List findByCompletedFalse(); + + public List findAll(); + + public Task getById(Long id); +} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/services/TaskService.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/services/TaskService.java new file mode 100644 index 0000000..aff11a1 --- /dev/null +++ b/cmd/jws/projects/spring-boot-todo/src/main/java/com/example/todo_spring/services/TaskService.java @@ -0,0 +1,47 @@ +package com.example.todo_spring.services; + +import com.example.todo_spring.models.Task; +import com.example.todo_spring.repositories.TaskRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TaskService { + @Autowired + private TaskRepository taskRepository; + + public Task createNewTask(Task task) { + return taskRepository.save(task); + } + + public List getAllTask() { + return taskRepository.findAll(); + } + + public Task findTaskById(Long id) { + return taskRepository.getById(id); + } + + public List findAllCompletedTask() { + return taskRepository.findByCompletedTrue(); + } + + public List findAllInCompleteTask() { + return taskRepository.findByCompletedFalse(); + } + + public void deleteTask(Task task) { + taskRepository.delete(task); + } + + public void deleteTaskById(Long id) { + Task task = taskRepository.getById(id); + taskRepository.delete(task); + } + + public Task updateTask(Task task) { + return taskRepository.save(task); + } +} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/TodoAppApplication.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/TodoAppApplication.java deleted file mode 100644 index b356f72..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/TodoAppApplication.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.todoapp; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class TodoAppApplication { - - public static void main(String[] args) { - SpringApplication.run(TodoAppApplication.class, args); - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/AuthController.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/AuthController.java deleted file mode 100644 index 29dcd72..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/AuthController.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.todoapp.controller; - -import com.todoapp.dto.LoginRequest; -import com.todoapp.dto.RegistrationRequest; -import com.todoapp.model.User; -import com.todoapp.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; -import java.util.Map; - -@RestController -@RequestMapping("/api/auth") -public class AuthController { - - private final UserService userService; - private final AuthenticationManager authenticationManager; - - @Autowired - public AuthController(UserService userService, AuthenticationManager authenticationManager) { - this.userService = userService; - this.authenticationManager = authenticationManager; - } - - @PostMapping("/register") - public ResponseEntity register(@RequestBody RegistrationRequest request) { - if (request.getUsername() == null || request.getPassword() == null || request.getEmail() == null) { - Map response = new HashMap<>(); - response.put("error", "Username, password, and email are required"); - return ResponseEntity.badRequest().body(response); - } - - if (userService.usernameExists(request.getUsername())) { - Map response = new HashMap<>(); - response.put("error", "Username already exists"); - return ResponseEntity.status(HttpStatus.CONFLICT).body(response); - } - - if (userService.emailExists(request.getEmail())) { - Map response = new HashMap<>(); - response.put("error", "Email already exists"); - return ResponseEntity.status(HttpStatus.CONFLICT).body(response); - } - - User user = new User(request.getUsername(), request.getPassword(), request.getEmail()); - userService.saveUser(user); - - Map response = new HashMap<>(); - response.put("message", "User registered successfully"); - return ResponseEntity.status(HttpStatus.CREATED).body(response); - } - - @PostMapping("/login") - public ResponseEntity login(@RequestBody LoginRequest request) { - if (request.getUsername() == null || request.getPassword() == null) { - Map response = new HashMap<>(); - response.put("error", "Username and password are required"); - return ResponseEntity.badRequest().body(response); - } - - try { - Authentication authentication = authenticationManager.authenticate( - new UsernamePasswordAuthenticationToken(request.getUsername(), request.getPassword())); - - SecurityContextHolder.getContext().setAuthentication(authentication); - - User user = userService.getUserByUsername(request.getUsername()) - .orElseThrow(() -> new RuntimeException("User not found")); - - Map response = new HashMap<>(); - response.put("message", "Login successful"); - response.put("username", user.getUsername()); - response.put("email", user.getEmail()); - - return ResponseEntity.ok(response); - } catch (Exception e) { - Map response = new HashMap<>(); - response.put("error", "Invalid credentials"); - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response); - } - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/TodoController.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/TodoController.java deleted file mode 100644 index 2cdb7aa..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/controller/TodoController.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.todoapp.controller; - -import com.todoapp.model.Todo; -import com.todoapp.service.TodoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.security.core.Authentication; -import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Optional; - -@RestController -@RequestMapping("/api/todos") -public class TodoController { - - private final TodoService todoService; - - @Autowired - public TodoController(TodoService todoService) { - this.todoService = todoService; - } - - @GetMapping - public ResponseEntity> getAllTodos(Authentication authentication) { - String username = authentication.getName(); - List todos = todoService.getTodosByUsername(username); - return ResponseEntity.ok(todos); - } - - @GetMapping("/{id}") - public ResponseEntity getTodoById(@PathVariable("id") Long id, Authentication authentication) { - String username = authentication.getName(); - Optional todoOptional = todoService.getTodoById(id); - if (todoOptional.isPresent()) { - Todo todo = todoOptional.get(); - if (!todo.getUser().getUsername().equals(username)) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); - } - return ResponseEntity.ok(todo); - } else { - return ResponseEntity.notFound().build(); - } - } - - @GetMapping("/completed") - public ResponseEntity> getCompletedTodos(Authentication authentication) { - String username = authentication.getName(); - List todos = todoService.getCompletedTodosByUsername(username); - return ResponseEntity.ok(todos); - } - - @GetMapping("/incomplete") - public ResponseEntity> getIncompleteTodos(Authentication authentication) { - String username = authentication.getName(); - List todos = todoService.getIncompleteTodosByUsername(username); - return ResponseEntity.ok(todos); - } - - @PostMapping - public ResponseEntity createTodo(@RequestBody Todo todo, Authentication authentication) { - String username = authentication.getName(); - Todo savedTodo = todoService.saveTodo(todo, username); - return ResponseEntity.status(HttpStatus.CREATED).body(savedTodo); - } - - @PutMapping("/{id}") - public ResponseEntity updateTodo(@PathVariable("id") Long id, @RequestBody Todo updatedTodo, - Authentication authentication) { - String username = authentication.getName(); - - Optional existingTodoOptional = todoService.getTodoById(id); - - if (existingTodoOptional.isPresent()) { - Todo existingTodo = existingTodoOptional.get(); - - if (!existingTodo.getUser().getUsername().equals(username)) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); - } - - updatedTodo.setId(id); - updatedTodo.setUser(existingTodo.getUser()); - - Optional updatedTodoOptional = todoService.updateTodo(updatedTodo); - if (updatedTodoOptional.isPresent()) { - return ResponseEntity.ok(updatedTodoOptional.get()); - } else { - return ResponseEntity.notFound().build(); - } - } else { - return ResponseEntity.notFound().build(); - } - } - - @DeleteMapping("/{id}") - public ResponseEntity deleteTodo(@PathVariable("id") Long id, Authentication authentication) { - String username = authentication.getName(); - - Optional todoOptional = todoService.getTodoById(id); - - if (todoOptional.isPresent()) { - Todo todo = todoOptional.get(); - - if (!todo.getUser().getUsername().equals(username)) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); - } - - boolean isDeleted = todoService.deleteTodo(id); - if (isDeleted) { - return ResponseEntity.noContent().build(); - } else { - return ResponseEntity.notFound().build(); - } - } else { - return ResponseEntity.notFound().build(); - } - } - - @PutMapping("/{id}/complete") - public ResponseEntity markTodoComplete(@PathVariable("id") Long id, Authentication authentication) { - String username = authentication.getName(); - - Optional todoOptional = todoService.getTodoById(id); - - if (todoOptional.isPresent()) { - Todo todo = todoOptional.get(); - - if (!todo.getUser().getUsername().equals(username)) { - return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); - } - - todo.setCompleted(true); - - Optional updatedTodoOptional = todoService.updateTodo(todo); - if (updatedTodoOptional.isPresent()) { - return ResponseEntity.ok(updatedTodoOptional.get()); - } else { - return ResponseEntity.notFound().build(); - } - } else { - return ResponseEntity.notFound().build(); - } - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/LoginRequest.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/LoginRequest.java deleted file mode 100644 index 5608a6e..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/LoginRequest.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java deleted file mode 100644 index 04561ec..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/dto/RegistrationRequest.java +++ /dev/null @@ -1,32 +0,0 @@ -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; - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/Todo.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/Todo.java deleted file mode 100644 index 0abf071..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/Todo.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.todoapp.model; - -import jakarta.persistence.*; -import com.fasterxml.jackson.annotation.JsonIgnore; -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) - @JsonIgnore - 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 + - '}'; - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/User.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/User.java deleted file mode 100644 index 9af8c5c..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/model/User.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.todoapp.model; - -import jakarta.persistence.*; -import com.fasterxml.jackson.annotation.JsonIgnore; -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) - @JsonIgnore // 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) - @JsonIgnore - private List 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 getTodos() { - return todos; - } - - public void setTodos(List 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 + '\'' + - '}'; - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/TodoRepository.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/TodoRepository.java deleted file mode 100644 index d6c229e..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/TodoRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.todoapp.repository; - -import com.todoapp.model.Todo; -import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; - -public interface TodoRepository extends JpaRepository { - List findByUserUsernameOrderByCompletedAscTargetDateAsc(String username); - - List findByUserUsernameAndCompletedTrue(String username); - - List findByUserUsernameAndCompletedFalseOrderByTargetDateAsc(String username); -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/UserRepository.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/UserRepository.java deleted file mode 100644 index 470532f..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/repository/UserRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.todoapp.repository; - -import com.todoapp.model.User; -import org.springframework.data.jpa.repository.JpaRepository; -import java.util.Optional; - -public interface UserRepository extends JpaRepository { - Optional findByUsername(String username); - - boolean existsByUsername(String username); - - boolean existsByEmail(String email); -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/SecurityConfig.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/SecurityConfig.java deleted file mode 100644 index 3e9b544..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/SecurityConfig.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.todoapp.security; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.SecurityFilterChain; -import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import java.util.Arrays; - -@Configuration -@EnableWebSecurity -public class SecurityConfig { - - @Autowired - private UserDetailsService userDetailsService; - - @Bean - public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception { - return http.getSharedObject(AuthenticationManagerBuilder.class) - .userDetailsService(userDetailsService) - .passwordEncoder(passwordEncoder()) - .and() - .build(); - } - - @Bean - public PasswordEncoder passwordEncoder() { - return new BCryptPasswordEncoder(); - } - - @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - http - .csrf().disable() - .cors().and() - .authorizeHttpRequests(auth -> auth - .requestMatchers("/api/auth/register").permitAll() - .requestMatchers("/api/auth/login").permitAll() - .anyRequest().authenticated()) - .httpBasic(); - - return http.build(); - } - - @Bean - public CorsConfigurationSource corsConfigurationSource() { - CorsConfiguration configuration = new CorsConfiguration(); - configuration.setAllowedOrigins(Arrays.asList("*")); - configuration.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS")); - configuration.setAllowedHeaders(Arrays.asList("Content-Type", "Authorization")); - configuration.setMaxAge(3600L); - - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", configuration); - return source; - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/UserDetailsServiceImpl.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/UserDetailsServiceImpl.java deleted file mode 100644 index d821693..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/security/UserDetailsServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.todoapp.security; - -import com.todoapp.model.User; -import com.todoapp.repository.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.stereotype.Service; -import java.util.Collections; - -@Service -public class UserDetailsServiceImpl implements UserDetailsService { - - private final UserRepository userRepository; - - @Autowired - public UserDetailsServiceImpl(UserRepository userRepository) { - this.userRepository = userRepository; - } - - @Override - public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { - User user = userRepository.findByUsername(username) - .orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username)); - - return new org.springframework.security.core.userdetails.User( - user.getUsername(), - user.getPassword(), - Collections.singletonList(new SimpleGrantedAuthority("ROLE_USER"))); - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/TodoService.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/TodoService.java deleted file mode 100644 index 0140554..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/TodoService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.todoapp.service; - -import com.todoapp.model.Todo; -import com.todoapp.model.User; -import com.todoapp.repository.TodoRepository; -import com.todoapp.repository.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; - -@Service -public class TodoService { - - private final TodoRepository todoRepository; - private final UserRepository userRepository; - - @Autowired - public TodoService(TodoRepository todoRepository, UserRepository userRepository) { - this.todoRepository = todoRepository; - this.userRepository = userRepository; - } - - public Todo saveTodo(Todo todo, String username) { - User user = userRepository.findByUsername(username) - .orElseThrow(() -> new RuntimeException("User not found")); - todo.setUser(user); - return todoRepository.save(todo); - } - - public Optional updateTodo(Todo todo) { - if (todoRepository.existsById(todo.getId())) { - return Optional.of(todoRepository.save(todo)); - } - return Optional.empty(); - } - - public boolean deleteTodo(Long id) { - if (todoRepository.existsById(id)) { - todoRepository.deleteById(id); - return true; - } - return false; - } - - public Optional getTodoById(Long id) { - return todoRepository.findById(id); - } - - public List getAllTodos() { - return todoRepository.findAll(); - } - - public List getTodosByUsername(String username) { - return todoRepository.findByUserUsernameOrderByCompletedAscTargetDateAsc(username); - } - - public List getCompletedTodosByUsername(String username) { - return todoRepository.findByUserUsernameAndCompletedTrue(username); - } - - public List getIncompleteTodosByUsername(String username) { - return todoRepository.findByUserUsernameAndCompletedFalseOrderByTargetDateAsc(username); - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/UserService.java b/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/UserService.java deleted file mode 100644 index 30cf5ac..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/java/com/todoapp/service/UserService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.todoapp.service; - -import com.todoapp.model.User; -import com.todoapp.repository.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Optional; - -@Service -public class UserService { - - private final UserRepository userRepository; - private final PasswordEncoder passwordEncoder; - - @Autowired - public UserService(UserRepository userRepository, PasswordEncoder passwordEncoder) { - this.userRepository = userRepository; - this.passwordEncoder = passwordEncoder; - } - - public User saveUser(User user) { - user.setPassword(passwordEncoder.encode(user.getPassword())); - return userRepository.save(user); - } - - public Optional getUserById(Long id) { - return userRepository.findById(id); - } - - public Optional getUserByUsername(String username) { - return userRepository.findByUsername(username); - } - - public List getAllUsers() { - return userRepository.findAll(); - } - - public boolean deleteUser(Long id) { - if (userRepository.existsById(id)) { - userRepository.deleteById(id); - return true; - } - return false; - } - - public boolean usernameExists(String username) { - return userRepository.existsByUsername(username); - } - - public boolean emailExists(String email) { - return userRepository.existsByEmail(email); - } -} diff --git a/cmd/jws/projects/spring-boot-todo/src/main/resources/META-INF/persistence.xml b/cmd/jws/projects/spring-boot-todo/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 1e6b316..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - org.hibernate.jpa.HibernatePersistenceProvider - com.todoapp.model.User - com.todoapp.model.Todo - - - - - - - - - - - diff --git a/cmd/jws/projects/spring-boot-todo/src/main/resources/application.properties b/cmd/jws/projects/spring-boot-todo/src/main/resources/application.properties index 1228279..e52e9af 100644 --- a/cmd/jws/projects/spring-boot-todo/src/main/resources/application.properties +++ b/cmd/jws/projects/spring-boot-todo/src/main/resources/application.properties @@ -1,21 +1,14 @@ -# Datenbankverbindung -spring.datasource.url=jdbc:postgresql://postgresdb:5432/todo_db -spring.datasource.username=postgres -spring.datasource.password=postgres -spring.datasource.driver-class-name=org.postgresql.Driver - -# JPA/Hibernate Einstellungen +spring.application.name=todo-spring +spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect spring.jpa.hibernate.ddl-auto=update -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.show-sql=true +#spring.jpa.hibernate.ddl-auto=none # Entferne oder kommentiere diese Zeile aus +spring.jpa.hibernate.show-sql=true +spring.datasource.url=jdbc:postgresql://localhost:5432/todolist +spring.datasource.username=myuser +spring.datasource.password=mypassword +spring.datasource.initialization-mode=never +#spring.datasource.initialize=true # Entferne oder kommentiere diese Zeile aus +#spring.datasource.schema=classpath:/schema.sql # Entferne oder kommentiere diese Zeile aus +spring.datasource.continue-on-error=true +server.port=8090 -# Server-Port -server.port=9080 - -# Logging (optional) -logging.level.org.springframework.web=INFO -logging.level.com.todoapp=DEBUG -logging.level.org.hibernate=ERROR - -# Security Debug (nur für Entwicklung) -logging.level.org.springframework.security=DEBUG diff --git a/cmd/jws/projects/spring-boot-todo/src/main/resources/hibernate.cfg.xml b/cmd/jws/projects/spring-boot-todo/src/main/resources/hibernate.cfg.xml deleted file mode 100644 index 33bdd20..0000000 --- a/cmd/jws/projects/spring-boot-todo/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - jdbc/PostgresDataSource - - - org.hibernate.dialect.PostgreSQLDialect - - - true - - - thread - - - update - - - - - - diff --git a/cmd/jws/projects/spring-boot-todo/src/main/resources/schema.sql b/cmd/jws/projects/spring-boot-todo/src/main/resources/schema.sql new file mode 100644 index 0000000..e69de29 diff --git a/go.mod b/go.mod index 36908b5..2188dfe 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,8 @@ module jws go 1.23.5 require ( - fyne.io/fyne/v2 v2.6.1 - fyne.io/tools v1.6.1 - github.com/spf13/viper v1.20.1 + fyne.io/fyne/v2 v2.6.0-alpha1 + fyne.io/tools v1.0.0-alpha1 ) require ( @@ -13,40 +12,28 @@ require ( github.com/BurntSushi/toml v1.4.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fredbi/uri v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.8.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fyne-io/gl-js v0.1.0 // indirect - github.com/fyne-io/glfw-js v0.2.0 // indirect - github.com/fyne-io/image v0.1.1 // indirect - github.com/fyne-io/oksvg v0.1.0 // indirect + github.com/fyne-io/glfw-js v0.1.0 // indirect + github.com/fyne-io/image v0.1.0 // indirect github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 // indirect github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect github.com/go-text/render v0.2.0 // indirect github.com/go-text/typesetting v0.2.1 // indirect - github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/hack-pad/go-indexeddb v0.3.2 // indirect - github.com/hack-pad/safejs v0.1.0 // indirect github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 // indirect github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect + github.com/kr/text v0.2.0 // indirect github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect github.com/nicksnyder/go-i18n/v2 v2.5.1 // indirect - github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rymdport/portal v0.4.1 // indirect - github.com/sagikazarmark/locafero v0.7.0 // indirect - github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.12.0 // indirect - github.com/spf13/cast v1.7.1 // indirect - github.com/spf13/pflag v1.0.6 // indirect + github.com/rymdport/portal v0.3.0 // indirect github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect github.com/stretchr/testify v1.10.0 // indirect - github.com/subosito/gotenv v1.6.0 // indirect github.com/yuin/goldmark v1.7.8 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.9.0 // indirect golang.org/x/image v0.24.0 // indirect - golang.org/x/net v0.35.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index f47153e..a92ba16 100644 --- a/go.sum +++ b/go.sum @@ -1,38 +1,26 @@ fyne.io/fyne/v2 v2.6.0-alpha1 h1:ALx1JJDdCYQpm5RS7CIK9bam9H7hddSDuRy/fyj9pb8= fyne.io/fyne/v2 v2.6.0-alpha1/go.mod h1:Bzv2yK+ncZ8LJbHKjyJJpEAFlbs6oulHgKm04ObOqA8= -fyne.io/fyne/v2 v2.6.1 h1:kjPJD4/rBS9m2nHJp+npPSuaK79yj6ObMTuzR6VQ1Is= -fyne.io/fyne/v2 v2.6.1/go.mod h1:YZt7SksjvrSNJCwbWFV32WON3mE1Sr7L41D29qMZ/lU= fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= fyne.io/tools v1.0.0-alpha1 h1:350eF+LVPbIHNgYPCoP04yCsQSFQ3aupATx33ClZjZk= fyne.io/tools v1.0.0-alpha1/go.mod h1:7gcHTl85tD/yLcGcU2bJGECAwSVAWrr99Ngmgrz/s54= -fyne.io/tools v1.6.1 h1:X4DmDcuFUV+g2cM8AGtNQSmLN0yqYKSiJ2Z3zPfofBA= -fyne.io/tools v1.6.1/go.mod h1:rzfZnWA1jZb/0IbYlBYHXhzH0povDGP8Psqfv7VsOYw= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= -github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= -github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8= github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4= -github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= -github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fyne-io/gl-js v0.1.0 h1:8luJzNs0ntEAJo+8x8kfUOXujUlP8gB3QMOxO2mUdpM= github.com/fyne-io/gl-js v0.1.0/go.mod h1:ZcepK8vmOYLu96JoxbCKJy2ybr+g1pTnaBDdl7c3ajI= github.com/fyne-io/glfw-js v0.1.0 h1:RGGMmVjcsG17Oifl3X2UJ5vH3PgS4B1UY3ASeN5BXbI= github.com/fyne-io/glfw-js v0.1.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= -github.com/fyne-io/glfw-js v0.2.0 h1:8GUZtN2aCoTPNqgRDxK5+kn9OURINhBEBc7M4O1KrmM= -github.com/fyne-io/glfw-js v0.2.0/go.mod h1:Ri6te7rdZtBgBpxLW19uBpp3Dl6K9K/bRaYdJ22G8Jk= github.com/fyne-io/image v0.1.0 h1:Vm2TQJ2PWGHCf3jYi1/XroaNNMu+GfI/O2QpSbZd4XQ= github.com/fyne-io/image v0.1.0/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= -github.com/fyne-io/image v0.1.1 h1:WH0z4H7qfvNUw5l4p3bC1q70sa5+YWVt6HCj7y4VNyA= -github.com/fyne-io/image v0.1.1/go.mod h1:xrfYBh6yspc+KjkgdZU/ifUC9sPA5Iv7WYUBzQKK7JM= -github.com/fyne-io/oksvg v0.1.0 h1:7EUKk3HV3Y2E+qypp3nWqMXD7mum0hCw2KEGhI1fnBw= -github.com/fyne-io/oksvg v0.1.0/go.mod h1:dJ9oEkPiWhnTFNCmRgEze+YNprJF7YRbpjgpWS4kzoI= github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= @@ -43,24 +31,14 @@ github.com/go-text/typesetting v0.2.1 h1:x0jMOGyO3d1qFAPI0j4GSsh7M0Q3Ypjzr4+CEVg github.com/go-text/typesetting v0.2.1/go.mod h1:mTOxEwasOFpAMBjEQDhdWRckoLLeI/+qrQeBCTGEt6M= github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0= github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= -github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= -github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/hack-pad/go-indexeddb v0.3.2 h1:DTqeJJYc1usa45Q5r52t01KhvlSN02+Oq+tQbSBI91A= -github.com/hack-pad/go-indexeddb v0.3.2/go.mod h1:QvfTevpDVlkfomY498LhstjwbPW6QC4VC/lxYb0Kom0= -github.com/hack-pad/safejs v0.1.0 h1:qPS6vjreAqh2amUqj4WNG1zIw7qlRQJ9K10eDKMCnE8= -github.com/hack-pad/safejs v0.1.0/go.mod h1:HdS+bKF1NrE72VoXZeWzxFOVQVUSqZJAG0xNCnb+Tio= github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08 h1:wMeVzrPO3mfHIWLZtDcSaGAe2I4PW9B/P5nMkRSwCAc= github.com/jeandeaual/go-locale v0.0.0-20241217141322-fcc2cadd6f08/go.mod h1:ZDXo8KHryOWSIqnsb/CiDq7hQUYryCgdVnxbj8tDG7o= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe972w/cYF+FjW34v27+9Vo5106B4M= github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= @@ -69,54 +47,24 @@ github.com/nicksnyder/go-i18n/v2 v2.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD github.com/nicksnyder/go-i18n/v2 v2.5.1/go.mod h1:DrhgsSDZxoAfvVrBVLXoxZn/pN5TXqaDbq7ju94viiQ= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= -github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8= github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= -github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA= -github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= -github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= -github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= -github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= -github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= -github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4= -github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= -github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= -github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.20.0 h1:zrxIyR3RQIOsarIrgL8+sAvALXul9jeEPa06Y0Ph6vY= -github.com/spf13/viper v1.20.0/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4= -github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4= -github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= -github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= golang.org/x/image v0.24.0 h1:AN7zRgVsbvmTfNyqIbbOraYL8mSwcKncEj8ofjgzcMQ= golang.org/x/image v0.24.0/go.mod h1:4b/ITuLfqYq1hqZcjofwctIhi7sZh2WaCjvsBNjjya8= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= diff --git a/internal/config/config.go b/internal/config/config.go deleted file mode 100644 index a49db5d..0000000 --- a/internal/config/config.go +++ /dev/null @@ -1,73 +0,0 @@ -package config - -import ( - "os" - "path/filepath" - - "github.com/spf13/viper" -) - -type Config struct { - ProjectsPath string `mapstructure:"projects_path"` - LogLevel string `mapstructure:"log_level"` - LogFilePath string `mapstructure:"log_file_path"` - DeploymentPath string `mapstructure:"deployment_path"` -} - -func LoadConfig() (*Config, error) { - configDir, err := os.UserConfigDir() - if err != nil { - return nil, err - } - configPath := filepath.Join(configDir, "jws_gui") - viper.SetConfigName("config") - viper.SetConfigType("toml") - viper.AddConfigPath(configPath) - - if err := viper.ReadInConfig(); err != nil { - if _, ok := err.(viper.ConfigFileNotFoundError); ok { - return createDefaultConfig(configPath) - } - return nil, err - } - - var config Config - if err := viper.Unmarshal(&config); err != nil { - return nil, err - } - - return &config, nil -} - -func createDefaultConfig(configPath string) (*Config, error) { - configDir, err := os.UserConfigDir() - if err != nil { - return nil, err - } - homeDir, err := os.UserHomeDir() - if err != nil { - return nil, err - } - - defaultConfig := Config{ - ProjectsPath: filepath.Join(configDir, "jws_gui", "projects"), - DeploymentPath: filepath.Join(homeDir, "Projects"), - LogLevel: "info", - LogFilePath: filepath.Join(configDir, "jws_gui", "logs", "jws_gui.log"), - } - - if err := os.MkdirAll(configPath, 0755); err != nil { - return nil, err - } - - viper.Set("projects_path", defaultConfig.ProjectsPath) - viper.Set("deployment_path", defaultConfig.DeploymentPath) - viper.Set("log_file_path", defaultConfig.LogFilePath) - viper.Set("log_level", defaultConfig.LogLevel) - - if err := viper.WriteConfigAs(filepath.Join(configPath, "config.toml")); err != nil { - return nil, err - } - - return &defaultConfig, nil -} diff --git a/internal/dependency/dependency.go b/internal/dependency/dependency.go index c6d43ed..1a5ab38 100644 --- a/internal/dependency/dependency.go +++ b/internal/dependency/dependency.go @@ -2,10 +2,9 @@ package dependency import ( "fmt" - "jws/internal/logger" osinfo "jws/internal/os" "jws/pkg/download" - "log/slog" + "log" "os" "os/exec" "path/filepath" @@ -13,18 +12,11 @@ import ( "strings" "fyne.io/fyne/v2" - "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/widget" "fyne.io/tools" ) -var log *slog.Logger - -func init() { - log = logger.GetChildLogger("dependency") -} - type Dependency struct { Name string Installed bool @@ -32,7 +24,6 @@ type Dependency struct { } func CheckDependencies(dependencies []Dependency) { - log.Info("Checking dependencies") // Check VSCode dependencies[0].Installed = checkVSCode() @@ -98,318 +89,227 @@ func InstallDependency(index int, sudoPassword string, dependencies []Dependency switch runtime.GOOS { case "windows": - cmd, err = installWindowsDependencies(index, cmd, &mainWindow) - if err != nil { - dialog.ShowError(err, mainWindow) - log.Error(err.Error()) + switch index { + case 0: // VSCode + cmd = tools.CommandInShell("winget", "install", "-e", "--id", + "Microsoft.VisualStudioCode") + case 1: // Docker Desktop + wslCheckCmd := tools.CommandInShell("wsl", "--status") + err := wslCheckCmd.Run() + if err != nil { + wslInstallCmd := tools.CommandInShell("wsl", "--install") + err = wslInstallCmd.Run() + if err != nil { + dialog.ShowError(fmt.Errorf("error: installing WSL: %v", err), mainWindow) + return + } + dialog.ShowInformation("WSL wird installiert", "WSL wird installiert. Bitte warten Sie, bis die Installation abgeschlossen ist und starten Sie die Anwendung neu.", mainWindow) + return + } + + cmd = tools.CommandInShell("winget", "install", "-e", "--id", + "Docker.DockerDesktop") } case "darwin": - cmd, err = installDarwinDependencies(index, cmd, &mainWindow) + brewCheckCmd := tools.CommandInShell("which", "brew") + err := brewCheckCmd.Run() if err != nil { - dialog.ShowError(err, mainWindow) - log.Error(err.Error()) + brewInstallCmd := tools.CommandInShell("bin/bash", "-c", "\"$(curl -fsSl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"") + err := brewInstallCmd.Run() + if err != nil { + dialog.ShowError(fmt.Errorf("error: installing homebrew falied: %v", err), mainWindow) + } + } + switch index { + case 0: // VSCode + cmd = tools.CommandInShell("brew", "install", "--cask", "visual-studio-code") + case 1: // Docker + cmd = tools.CommandInShell("brew", "install", "docker") } case "linux": - err = installLinuxDependencies(index, sudoPassword, cmd, dependencies, &mainWindow) + osInfo, err := osinfo.GetLinuxDistribution() if err != nil { - log.Error(err.Error()) - dialog.ShowError(err, mainWindow) + log.Println(err) + dialog.ShowError(fmt.Errorf("error getting OS info: %v", err), mainWindow) + return + } + + var downloadURL, fileName string + switch index { + case 0: // VSCode + switch osInfo.ID { + case "debian", "ubuntu", "linuxmint": + downloadURL = "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" + fileName = "vscode.deb" + case "fedora": + downloadURL = "https://code.visualstudio.com/sha/download?build=stable&os=linux-rpm-x64" + fileName = "vscode.rpm" + default: + dialog.ShowInformation("Nicht unterstützt", fmt.Sprintf("Automatische Installation für dieses OS %v nicht verfügbar", osInfo), mainWindow) + return + } + go func() { + progressBar := widget.NewProgressBar() + progressDialog := dialog.NewCustomWithoutButtons("Download in progress", progressBar, mainWindow) + + progressDialog.Show() + + homeDir, _ := os.UserHomeDir() + downloadDir := filepath.Join(homeDir, "Downloads") + filePath := filepath.Join(downloadDir, fileName) + + err := download.WithProgressBar(downloadURL, filePath, progressBar) + progressDialog.Hide() + + if err != nil { + dialog.ShowError(err, mainWindow) + return + } + + var installCmd string + switch osInfo.ID { + case "debian", "ubuntu", "linuxmint": + installCmd = fmt.Sprintf("sudo -S dpkg -i %s", filePath) + case "fedora": + installCmd = fmt.Sprintf("sudo -S dnf install -y %s", filePath) + } + + cmd := exec.Command("sh", "-c", installCmd) + cmd.Stdin = strings.NewReader(sudoPassword + "\n") + + dialog.ShowInformation("Installation gestartet", + "Die Installation von VSCode wurde gestartet.", mainWindow) + + output, err := cmd.CombinedOutput() + if err != nil { + dialog.ShowError(fmt.Errorf("installation failed:\n%s", output), mainWindow) + return + } else { + dialog.ShowInformation("Erfolg", "VSCode erfolgreich installiert!", mainWindow) + CheckDependencies(dependencies) + } + }() + case 1: // Docker + go func() { + progressBar := widget.NewProgressBar() + progressDialog := dialog.NewCustomWithoutButtons("Docker Installation läuft...", progressBar, mainWindow) + progressDialog.Show() + + osInfo, err := osinfo.GetLinuxDistribution() + if err != nil { + progressDialog.Hide() + dialog.ShowError(fmt.Errorf("error getting os infos: %v", err), mainWindow) + return + } + + var commands []string + var cleanupCommands []string + var totalSteps int + + switch osInfo.ID { + case "ubuntu", "linuxmint", "debian": + // Ubuntu/Debian Commands + distroPath := "ubuntu" + codeName := "$(. /etc/os-release && echo \"${UBUNTU_CODENAME:-$VERSION_CODENAME}\")" + if osInfo.ID == "debian" { + distroPath = "debian" + codeName = "$(. /etc/os-release && echo \"$VERSION_CODENAME\")" + } + arch := "$(dpkg --print-architecture)" + + commands = []string{ + "apt-get update", + "apt-get install -y wget", + fmt.Sprintf("wget -qO- https://download.docker.com/linux/%s/dists/%s/pool/stable/%s/ | grep -oP 'href=\"\\K[^\"]*(?=.*deb)' | xargs -I{} wget https://download.docker.com/linux/%s/dists/%s/pool/stable/%s/{}", + distroPath, codeName, arch, distroPath, codeName, arch), + "dpkg -i ./containerd.io*.deb docker-ce*.deb docker-ce-cli*.deb docker-buildx-plugin*.deb docker-compose-plugin*.deb", + "apt-get install -f -y", + "service docker start", + } + + cleanupCommands = []string{ + "rm -rf ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb ./docker-buildx-plugin*.deb ./docker-compose-plugin*.deb", + "apt-get autoremove -y", + "apt-get clean", + } + + totalSteps = len(commands) + len(cleanupCommands) + + case "fedora": + // Fedora Commands + fedoraVer := "$(rpm -E %fedora)" + commands = []string{ + "dnf install -y wget", + fmt.Sprintf("wget https://download.docker.com/linux/fedora/%s/x86_64/stable/Packages/containerd-*.rpm docker-*.rpm docker-ce-*.rpm", fedoraVer), + "dnf install -y ./*.rpm", + "systemctl enable --now docker", + } + + cleanupCommands = []string{ + "rm -rf ./containerd-*.rpm ./docker-*.rpm ./docker-ce-*.rpm", + "dnf autoremove -y", + "dnf clean all", + } + + totalSteps = len(commands) + len(cleanupCommands) + + default: + progressDialog.Hide() + dialog.ShowInformation("not supported", "Automatic Docker installation not supported for your OS.", mainWindow) + return + } + + progressStep := 1.0 / float64(totalSteps) + currentProgress := 0.0 + + for _, cmd := range commands { + command := exec.Command("sudo", "-S", "sh", "-c", cmd) + command.Stdin = strings.NewReader(sudoPassword + "\n") + + if output, err := command.CombinedOutput(); err != nil { + progressDialog.Hide() + dialog.ShowError(fmt.Errorf("error at %s:\n%s", cmd, output), mainWindow) + return + } + + currentProgress += progressStep + progressBar.SetValue(currentProgress) + } + + for _, cmd := range cleanupCommands { + command := exec.Command("sudo", "-S", "sh", "-c", cmd) + command.Stdin = strings.NewReader(sudoPassword + "\n") + + if output, err := command.CombinedOutput(); err != nil { + progressDialog.Hide() + dialog.ShowError(fmt.Errorf("cleanup error at %s:\n%s", cmd, output), mainWindow) + return + } + + currentProgress += progressStep + progressBar.SetValue(currentProgress) + } + + progressDialog.Hide() + + dialog.ShowInformation( + "Installation finished", + "Docker was succesfully installed! Please re-start your system to let the changes take effect.", + mainWindow, + ) + + CheckDependencies(dependencies) + }() } } if cmd != nil { - showInstallProgressBar(mainWindow, fmt.Sprintf("installing %v", depName), cmd, depName, dependencies) - } -} - -func installWindowsDependencies(index int, cmd *exec.Cmd, mainWindow *fyne.Window) (*exec.Cmd, error) { - switch index { - case 0: // VSCode - cmd = tools.CommandInShell("winget", "install", "-e", "--id", - "Microsoft.VisualStudioCode", "--accept-package-agreements", "--accept-source-agreements", "--silent") - case 1: // Docker Desktop - wslCheckCmd := tools.CommandInShell("wsl", "--status") - err := wslCheckCmd.Run() + err = cmd.Start() if err != nil { - wslInstallCmd := tools.CommandInShell("wsl", "--install", "ubuntu") - dialog.ShowInformation("installing wsl", "WSL will be installed. Please wait untill installation is finished and reopen 'jws'.", *mainWindow) - err = wslInstallCmd.Run() - if err != nil { - wslEnabled, err := checkWslFeaturesEnabled() - if err != nil { - return nil, fmt.Errorf("error checking WSL features: %v", err) - } - if !wslEnabled { - dialog.ShowInformation("activate wsl", "WSL has to be activated. Please confirm to active necessary features.", *mainWindow) - err = enableWslFeatures() - if err != nil { - return nil, fmt.Errorf("error enabling WSL features: %v", err) - } - dialog.ShowInformation("reboot required", "Please reboot your PC to finish wsl activation and reopen 'jws'.", *mainWindow) - return nil, fmt.Errorf("reboot required") - } - errMsg := fmt.Errorf("error: installing WSL: %v", err) - return nil, errMsg - } - return nil, err - } - cmd = tools.CommandInShell("winget", "install", "-e", "--id", - "Docker.DockerDesktop", "--accept-package-agreements", "--accept-source-agreements", "--silent") - } - return cmd, nil -} - -func checkWslFeaturesEnabled() (bool, error) { - cmd := tools.CommandInShell("powershell", "-Command", - "[bool](Get-WindowsOptionalFeature -Online -FeatureName VirtualMachinePlatform).State -and [bool](Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux).State") - - output, err := cmd.CombinedOutput() - if err != nil { - return false, fmt.Errorf("error executing PowerShell command: %v\nOutput: %s", err, string(output)) - } - - enabled := strings.TrimSpace(string(output)) == "True" - return enabled, nil -} - -func enableWslFeatures() error { - cmd := tools.CommandInShell("powershell", "-Command", - "Enable-WindowsOptionalFeature -Online -FeatureName VirtualMachinePlatform -NoRestart; Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux -NoRestart") - - output, err := cmd.CombinedOutput() - if err != nil { - return fmt.Errorf("error executing PowerShell command: %v\nOutput: %s", err, string(output)) - } - - return nil -} - -func installDarwinDependencies(index int, cmd *exec.Cmd, mainWindow *fyne.Window) (*exec.Cmd, error) { - brewCheckCmd := tools.CommandInShell("which", "brew") - err := brewCheckCmd.Run() - if err != nil { - brewInstallCmd := tools.CommandInShell("bin/bash", "-c", "\"$(curl -fsSl https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\"") - err := brewInstallCmd.Run() - if err != nil { - errMsg := fmt.Errorf("error: installing homebrew falied: %v", err) - return nil, errMsg - } - } - switch index { - case 0: // VSCode - cmd = tools.CommandInShell("brew", "install", "--cask", "visual-studio-code") - case 1: // Docker - cmd = tools.CommandInShell("brew", "install", "docker") - } - return cmd, nil -} - -func installLinuxDependencies(index int, sudoPassword string, cmd *exec.Cmd, dependencies []Dependency, mainWindow *fyne.Window) error { - osInfo, err := osinfo.GetLinuxDistribution() - if err != nil { - errMsg := fmt.Errorf("error getting OS info: %v", err) - return errMsg - } - - var downloadURL, fileName string - switch index { - case 0: // VSCode - switch osInfo.ID { - case "debian", "ubuntu", "linuxmint": - downloadURL = "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-x64" - fileName = "vscode.deb" - case "fedora": - downloadURL = "https://code.visualstudio.com/sha/download?build=stable&os=linux-rpm-x64" - fileName = "vscode.rpm" - default: - dialog.ShowInformation("Nicht unterstützt", fmt.Sprintf("Automatische Installation für dieses OS %v nicht verfügbar", osInfo), *mainWindow) - return nil - } - go func() { - progressBar := widget.NewProgressBar() - progressDialog := dialog.NewCustomWithoutButtons("Download in progress", progressBar, *mainWindow) - - progressDialog.Show() - - homeDir, _ := os.UserHomeDir() - downloadDir := filepath.Join(homeDir, "Downloads") - filePath := filepath.Join(downloadDir, fileName) - - err := download.WithProgressBar(downloadURL, filePath, progressBar) - progressDialog.Hide() - - if err != nil { - log.Error(err.Error()) - dialog.ShowError(err, *mainWindow) - return - } - - var installCmd string - switch osInfo.ID { - case "debian", "ubuntu", "linuxmint": - installCmd = fmt.Sprintf("sudo -S dpkg -i %s", filePath) - case "fedora": - installCmd = fmt.Sprintf("sudo -S dnf install -y %s", filePath) - } - - cmd := exec.Command("sh", "-c", installCmd) - cmd.Stdin = strings.NewReader(sudoPassword + "\n") - - dialog.ShowInformation("Installation started", - "Installation of VSCode started.", *mainWindow) - - output, err := cmd.CombinedOutput() - if err != nil { - errMsg := fmt.Errorf("installation failed:\n%s", output) - dialog.ShowError(errMsg, *mainWindow) - log.Error(errMsg.Error()) - return - } else { - dialog.ShowInformation("Success", "VSCode succesfully installed!", *mainWindow) - CheckDependencies(dependencies) - } - }() - case 1: // Docker - go func() { - progressBar := widget.NewProgressBar() - progressDialog := dialog.NewCustomWithoutButtons("Docker installation in progress...", progressBar, *mainWindow) - progressDialog.Show() - - osInfo, err := osinfo.GetLinuxDistribution() - if err != nil { - progressDialog.Hide() - errMsg := fmt.Errorf("error getting os infos: %v", err) - dialog.ShowError(errMsg, *mainWindow) - log.Error(errMsg.Error()) - return - } - - var commands []string - var cleanupCommands []string - var totalSteps int - - switch osInfo.ID { - case "ubuntu", "linuxmint", "debian": - // Ubuntu/Debian Commands - distroPath := "ubuntu" - codeName := "$(. /etc/os-release && echo \"${UBUNTU_CODENAME:-$VERSION_CODENAME}\")" - if osInfo.ID == "debian" { - distroPath = "debian" - codeName = "$(. /etc/os-release && echo \"$VERSION_CODENAME\")" - } - arch := "$(dpkg --print-architecture)" - - commands = []string{ - "apt-get update", - "apt-get install -y wget", - fmt.Sprintf("wget -qO- https://download.docker.com/linux/%s/dists/%s/pool/stable/%s/ | grep -oP 'href=\"\\K[^\"]*(?=.*deb)' | xargs -I{} wget https://download.docker.com/linux/%s/dists/%s/pool/stable/%s/{}", - distroPath, codeName, arch, distroPath, codeName, arch), - "dpkg -i ./containerd.io*.deb docker-ce*.deb docker-ce-cli*.deb docker-buildx-plugin*.deb docker-compose-plugin*.deb", - "apt-get install -f -y", - "service docker start", - } - - cleanupCommands = []string{ - "rm -rf ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb ./docker-buildx-plugin*.deb ./docker-compose-plugin*.deb", - "apt-get autoremove -y", - "apt-get clean", - } - - totalSteps = len(commands) + len(cleanupCommands) - - case "fedora": - fedoraVer := "$(rpm -E %fedora)" - commands = []string{ - "dnf install -y wget", - fmt.Sprintf("wget https://download.docker.com/linux/fedora/%s/x86_64/stable/Packages/containerd-*.rpm docker-*.rpm docker-ce-*.rpm", fedoraVer), - "dnf install -y ./*.rpm", - "systemctl enable --now docker", - } - - cleanupCommands = []string{ - "rm -rf ./containerd-*.rpm ./docker-*.rpm ./docker-ce-*.rpm", - "dnf autoremove -y", - "dnf clean all", - } - - totalSteps = len(commands) + len(cleanupCommands) - - default: - progressDialog.Hide() - dialog.ShowInformation("not supported", "Automatic Docker installation not supported for your OS.", *mainWindow) - return - } - - progressStep := 1.0 / float64(totalSteps) - currentProgress := 0.0 - - for _, cmd := range commands { - command := exec.Command("sudo", "-S", "sh", "-c", cmd) - command.Stdin = strings.NewReader(sudoPassword + "\n") - - if output, err := command.CombinedOutput(); err != nil { - progressDialog.Hide() - errMsg := fmt.Errorf("error at %s:\n%s", cmd, output) - dialog.ShowError(errMsg, *mainWindow) - log.Error(errMsg.Error()) - return - } - - currentProgress += progressStep - progressBar.SetValue(currentProgress) - } - - for _, cmd := range cleanupCommands { - command := exec.Command("sudo", "-S", "sh", "-c", cmd) - command.Stdin = strings.NewReader(sudoPassword + "\n") - - if output, err := command.CombinedOutput(); err != nil { - progressDialog.Hide() - errMsg := fmt.Errorf("cleanup error at %s:\n%s", cmd, output) - dialog.ShowError(errMsg, *mainWindow) - log.Error(errMsg.Error()) - return - } - - currentProgress += progressStep - progressBar.SetValue(currentProgress) - } - - progressDialog.Hide() - - dialog.ShowInformation( - "Installation finished", - "Docker was succesfully installed! Please re-start your system to let the changes take effect.", - *mainWindow, - ) - - CheckDependencies(dependencies) - }() - } - return nil -} - -func showInstallProgressBar(window fyne.Window, message string, cmd *exec.Cmd, depName string, dependencies []Dependency) { - progress := widget.NewProgressBarInfinite() - content := container.NewVBox( - widget.NewLabel(message), - progress, - ) - popup := widget.NewModalPopUp(content, window.Canvas()) - popup.Show() - - go func() { - err := cmd.Run() - - popup.Hide() - - if err != nil { - errMsg := fmt.Errorf("error during installation of %s: %v", depName, err) - dialog.ShowError(errMsg, window) - log.Error(errMsg.Error()) + dialog.ShowError(fmt.Errorf("error starting installation process: %v", err), mainWindow) } else { - dialog.ShowInformation("Installation finished", fmt.Sprintf("%s successfully installed!", depName), window) - CheckDependencies(dependencies) + dialog.ShowInformation("Installation started", + fmt.Sprintf("Installation of %s was started", depName), mainWindow) } - }() + } } diff --git a/internal/gui/dependency_screen.go b/internal/gui/dependency_screen.go index a6b7eb3..d6921ac 100644 --- a/internal/gui/dependency_screen.go +++ b/internal/gui/dependency_screen.go @@ -64,7 +64,7 @@ func ShowDependencyScreen() { ShowProjectScreen() } else { dialog.ShowInformation("dependencies missing", - "Please install all required dependencies before proceeding.", mainWindow) + "Bitte installieren Sie alle erforderlichen Abhängigkeiten, bevor Sie fortfahren.", mainWindow) } }) diff --git a/internal/gui/gui.go b/internal/gui/gui.go index dabd873..be2ff2a 100644 --- a/internal/gui/gui.go +++ b/internal/gui/gui.go @@ -3,10 +3,7 @@ package gui import ( "embed" "jws/internal/dependency" - "jws/internal/logger" "jws/internal/project" - "log/slog" - "runtime" "fyne.io/fyne/v2" "fyne.io/fyne/v2/data/binding" @@ -20,12 +17,10 @@ var ( dependencies []dependency.Dependency projects []project.Project projectsFS embed.FS - log *slog.Logger ) // Init initializes the GUI package with required dependencies func Init(window fyne.Window, deps []dependency.Dependency, projs []project.Project, fs embed.FS) { - log = logger.GetChildLogger("gui") mainWindow = window dependencies = deps projects = projs @@ -34,23 +29,19 @@ func Init(window fyne.Window, deps []dependency.Dependency, projs []project.Proj // ShowPasswordDialog shows a dialog to enter sudo password for installations func ShowPasswordDialog(index int) { - if runtime.GOOS == "linux" || runtime.GOOS == "darwin" { - password := binding.NewString() - entry := widget.NewEntryWithData(password) - entry.Password = true + password := binding.NewString() + entry := widget.NewEntryWithData(password) + entry.Password = true - dialog.NewForm("Sudo Password", "ok", "cancel", - []*widget.FormItem{widget.NewFormItem("password", entry)}, - func(b bool) { - pass, err := password.Get() - if err == nil { - if b { - dependency.InstallDependency(index, pass, dependencies, mainWindow) - } + dialog.NewForm("Sudo Password", "ok", "cancel", + []*widget.FormItem{widget.NewFormItem("password", entry)}, + func(b bool) { + pass, err := password.Get() + if err == nil { + if b { + dependency.InstallDependency(index, pass, dependencies, mainWindow) } - }, - mainWindow).Show() - } else { - dependency.InstallDependency(index, "", dependencies, mainWindow) - } + } + }, + mainWindow).Show() } diff --git a/internal/logger/logger.go b/internal/logger/logger.go deleted file mode 100644 index 9e01358..0000000 --- a/internal/logger/logger.go +++ /dev/null @@ -1,54 +0,0 @@ -package logger - -import ( - "fmt" - "log/slog" - "os" - "path/filepath" - "sync" -) - -var ( - Logger *slog.Logger - once sync.Once -) - -func Init(logFilePath string, logLevel slog.Level) error { - logDir := filepath.Dir(logFilePath) - if _, err := os.Stat(logDir); os.IsNotExist(err) { - err := os.MkdirAll(logDir, 0755) - if err != nil { - return err - } - } - - logFile, err := os.OpenFile(logFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) - if err != nil { - return err - } - - opts := &slog.HandlerOptions{ - Level: logLevel, - } - - fileHandler := slog.NewJSONHandler(logFile, opts) - Logger = slog.New(fileHandler) - - return nil -} - -func GetChildLogger(name string) *slog.Logger { - once.Do(func() { - configDir, err := os.UserConfigDir() - if err != nil { - fmt.Printf("error getting User Condfig Dir: %v\n", err) - } - logDir := filepath.Join(configDir, "jws_gui", "logs") - if Logger == nil { - defaultLogFilePath := filepath.Join(logDir, "jws_gui.log") - defaultLogLevel := slog.LevelInfo - Init(defaultLogFilePath, defaultLogLevel) - } - }) - return Logger.With("package", name) -} diff --git a/internal/os/osinfo.go b/internal/os/osinfo.go index 80c83f4..e5f54da 100644 --- a/internal/os/osinfo.go +++ b/internal/os/osinfo.go @@ -2,8 +2,7 @@ package os import ( "fmt" - "jws/internal/logger" - "log/slog" + "log" "os" "os/exec" "strings" @@ -16,12 +15,6 @@ type OS struct { PackageManager string } -var log *slog.Logger - -func init() { - log = logger.GetChildLogger("os") -} - func GetLinuxDistribution() (*OS, error) { _, err := os.Stat("/etc/os-release") if os.IsNotExist(err) { @@ -56,8 +49,7 @@ func parseOsRelease(osRelease string) *OS { } err := result.getPackageManager() if err != nil { - log.Error(err.Error()) - os.Exit(1) + log.Fatal(err) } return &result } diff --git a/internal/project/project.go b/internal/project/project.go index d7f6dd0..6e7dd9b 100644 --- a/internal/project/project.go +++ b/internal/project/project.go @@ -4,9 +4,6 @@ import ( "embed" "fmt" "io/fs" - "jws/internal/config" - "jws/internal/logger" - "log/slog" "os" "os/exec" "path/filepath" @@ -23,22 +20,16 @@ type Project struct { FolderName string `json:"folderName"` } -var ( - log *slog.Logger - projects []Project - conf config.Config -) - -func Init(projs []Project, config *config.Config) { - log = logger.GetChildLogger("project") - projects = projs - conf = *config -} - func DeployProject(index int, projects []Project, projectsFS embed.FS, mainWindow fyne.Window) { project := projects[index] - projectPath := filepath.Join(conf.DeploymentPath, project.FolderName) + homeDir, err := os.UserHomeDir() + if err != nil { + dialog.ShowError(fmt.Errorf("error getting home directory: %v", err), mainWindow) + return + } + + projectPath := filepath.Join(homeDir, "Projects", project.FolderName) confirmDialog := dialog.NewConfirm( "deploying project", @@ -56,18 +47,14 @@ func DeployProject(index int, projects []Project, projectsFS embed.FS, mainWindo progress.SetValue(0.1) err := os.MkdirAll(projectPath, 0755) if err != nil { - errMsg := fmt.Errorf("error creating directory: %v", err) - dialog.ShowError(errMsg, mainWindow) - log.Error(errMsg.Error()) + dialog.ShowError(fmt.Errorf("error creating directory: %v", err), mainWindow) return } progress.SetValue(0.3) err = CopyEmbeddedProject(projectsFS, project.FolderName, projectPath) if err != nil { - errMsg := fmt.Errorf("error copying project files: %v", err) - dialog.ShowError(errMsg, mainWindow) - log.Error(errMsg.Error()) + dialog.ShowError(fmt.Errorf("error copying project files: %v", err), mainWindow) return } @@ -87,9 +74,7 @@ func DeployProject(index int, projects []Project, projectsFS embed.FS, mainWindo progress.SetValue(0.9) err = openCmd.Run() if err != nil { - errMsg := fmt.Errorf("error opening VS Code: %v", err) - dialog.ShowError(errMsg, mainWindow) - log.Error(errMsg.Error()) + dialog.ShowError(fmt.Errorf("error opening VS Code: %v", err), mainWindow) return } } diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 7190a60..0000000 --- a/renovate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json" -} diff --git a/sbom.json b/sbom.json deleted file mode 100644 index e4484a6..0000000 --- a/sbom.json +++ /dev/null @@ -1,1519 +0,0 @@ -{ - "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", - "bomFormat": "CycloneDX", - "specVersion": "1.6", - "serialNumber": "urn:uuid:4e0489d5-5636-4ff3-b80e-bcfff9da7d7f", - "version": 1, - "metadata": { - "timestamp": "2025-03-30T12:25:46+02:00", - "tools": [ - { - "vendor": "CycloneDX", - "name": "cyclonedx-gomod", - "version": "v1.9.0", - "hashes": [ - { - "alg": "MD5", - "content": "4946e448140ba8faeddacbe7a71f1522" - }, - { - "alg": "SHA-1", - "content": "db558a917ec8e829a2c08c113f21e3e6b3343c18" - }, - { - "alg": "SHA-256", - "content": "2cc216751b462902f566eb1339711ad0c0fc13052ee441bcf3e71163b128df78" - }, - { - "alg": "SHA-384", - "content": "afc86c8723f445aeadc2ed86ec7eb9f98e124455f62952d8bb1ba76b05322c665448d5165f08197d9dfd267ba854c72d" - }, - { - "alg": "SHA-512", - "content": "d442b5669e0663ffdea6cb3ff127c5fc2d67bcdf24c87d199947b3972dcdcfbf6e2ebbba9383b8488f0847e2d14d7357edad39c357a32e86778b03c9b31cf8b5" - } - ], - "externalReferences": [ - { - "url": "https://github.com/CycloneDX/cyclonedx-gomod", - "type": "vcs" - }, - { - "url": "https://cyclonedx.org", - "type": "website" - } - ] - } - ], - "component": { - "bom-ref": "pkg:golang/jws@v0.6.0?type=module", - "type": "application", - "name": "jws", - "version": "v0.6.0", - "purl": "pkg:golang/jws@v0.6.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - } - }, - "components": [ - { - "bom-ref": "pkg:golang/fyne.io/fyne/v2@v2.6.0-alpha1?type=module", - "type": "library", - "name": "fyne.io/fyne/v2", - "version": "v2.6.0-alpha1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "00bc752490dd0984299b9452ec220af5b6a6f47ee175d483b91cbf7f28fda5bf" - } - ], - "purl": "pkg:golang/fyne.io/fyne/v2@v2.6.0-alpha1?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/fyne.io/systray@v1.11.0?type=module", - "type": "library", - "name": "fyne.io/systray", - "version": "v1.11.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "0fd1c84a5c52931fa31d29e230147a7c214e523935c7f38e3892daf6525800a8" - } - ], - "purl": "pkg:golang/fyne.io/systray@v1.11.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "Apache-2.0" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/fyne.io/tools@v1.0.0-alpha1?type=module", - "type": "library", - "name": "fyne.io/tools", - "version": "v1.0.0-alpha1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "df9d1e17e2d53db20736060f0a83f4e320ac412150ddaba9013c77dc29598d99" - } - ], - "purl": "pkg:golang/fyne.io/tools@v1.0.0-alpha1?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module", - "type": "library", - "name": "github.com/BurntSushi/toml", - "version": "v1.4.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "92ea08c59432d96451935a6db60f5ab1ff9656fead590b8135598af3e9ea3ebd" - } - ], - "purl": "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/BurntSushi/toml", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "type": "library", - "name": "github.com/davecgh/go-spew", - "version": "v1.1.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "be3f63feed5baa7bc211f24ec1486d94e011aacdfeae41d8635de36164d4f7b7" - } - ], - "purl": "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/davecgh/go-spew", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "0BSD" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/fredbi/uri@v1.1.0?type=module", - "type": "library", - "name": "github.com/fredbi/uri", - "version": "v1.1.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "3aa2e94d7b72460f400517aabc319d24fa99531b3c73204338c5c16ec902681f" - } - ], - "purl": "pkg:golang/github.com/fredbi/uri@v1.1.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/fredbi/uri", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/fsnotify/fsnotify@v1.8.0?type=module", - "type": "library", - "name": "github.com/fsnotify/fsnotify", - "version": "v1.8.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "740c2be900530592241bcae841a2631a87f4a69d04785fad355ed804fdc5ffc3" - } - ], - "purl": "pkg:golang/github.com/fsnotify/fsnotify@v1.8.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/fsnotify/fsnotify", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/fyne-io/gl-js@v0.1.0?type=module", - "type": "library", - "name": "github.com/fyne-io/gl-js", - "version": "v0.1.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "f25b89ccdb349ed100268fbcc7c91f50e5ee8d494ff2007740c3b13b69947693" - } - ], - "purl": "pkg:golang/github.com/fyne-io/gl-js@v0.1.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/fyne-io/gl-js", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/fyne-io/glfw-js@v0.1.0?type=module", - "type": "library", - "name": "github.com/fyne-io/glfw-js", - "version": "v0.1.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "44618c9958dcb06d7b3a27e5dd7d94279bc7dcf812e01d5463701278de415db2" - } - ], - "purl": "pkg:golang/github.com/fyne-io/glfw-js@v0.1.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/fyne-io/glfw-js", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/fyne-io/image@v0.1.0?type=module", - "type": "library", - "name": "github.com/fyne-io/image", - "version": "v0.1.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "566d93409d8f5861c27f78d88b5fd7ae868d34cbbe19f23f3b642949b65de174" - } - ], - "purl": "pkg:golang/github.com/fyne-io/image@v0.1.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/fyne-io/image", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/go-gl/gl@v0.0.0-20231021071112-07e5d0ea2e71?type=module", - "type": "library", - "name": "github.com/go-gl/gl", - "version": "v0.0.0-20231021071112-07e5d0ea2e71", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "e4157039a512053955668c063ba5591b0d87ff397d9eb77778265f615f8d7d00" - } - ], - "purl": "pkg:golang/github.com/go-gl/gl@v0.0.0-20231021071112-07e5d0ea2e71?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-gl/gl", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20240506104042-037f3cc74f2a?type=module", - "type": "library", - "name": "github.com/go-gl/glfw/v3.3/glfw", - "version": "v0.0.0-20240506104042-037f3cc74f2a", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "bf19c18450c34fec73c5fd634c928c299c371f4b307d693d46959b05b0cae7ed" - } - ], - "purl": "pkg:golang/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20240506104042-037f3cc74f2a?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-gl/glfw/v3.3/glfw", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/go-text/render@v0.2.0?type=module", - "type": "library", - "name": "github.com/go-text/render", - "version": "v0.2.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "2c16284e6a798d8889e0d3ea0dcda9cf5ecc2e6037c07c3575949519c39d7807" - } - ], - "purl": "pkg:golang/github.com/go-text/render@v0.2.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-text/render", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "Unlicense" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/go-text/typesetting@v0.2.1?type=module", - "type": "library", - "name": "github.com/go-text/typesetting", - "version": "v0.2.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "c748cc386c8edddd6a1403c8d23e064ac87b3344376298f3af8f8211583cd95f" - } - ], - "purl": "pkg:golang/github.com/go-text/typesetting@v0.2.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-text/typesetting", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "Unlicense" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/go-viper/mapstructure/v2@v2.2.1?type=module", - "type": "library", - "name": "github.com/go-viper/mapstructure/v2", - "version": "v2.2.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "64068e0b100d32e671e5109e834981744664ec365ab2fbd9231b47ab1f1a1acb" - } - ], - "purl": "pkg:golang/github.com/go-viper/mapstructure/v2@v2.2.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-viper/mapstructure", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module", - "type": "library", - "name": "github.com/godbus/dbus/v5", - "version": "v5.1.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "e0a2e40314f768e63c2e2e054497bf2af868345171a349ba7cdb8550ef102549" - } - ], - "purl": "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/godbus/dbus", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-2-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/jeandeaual/go-locale@v0.0.0-20241217141322-fcc2cadd6f08?type=module", - "type": "library", - "name": "github.com/jeandeaual/go-locale", - "version": "v0.0.0-20241217141322-fcc2cadd6f08", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "c0c795ceb3cede67c72162d9b4371268601ed88e0f5bd07f3f99cc9114b00807" - } - ], - "purl": "pkg:golang/github.com/jeandeaual/go-locale@v0.0.0-20241217141322-fcc2cadd6f08?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/jeandeaual/go-locale", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module", - "type": "library", - "name": "github.com/jsummers/gobmp", - "version": "v0.0.0-20230614200233-a9de23ed2e25", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "60bbebd5e13a71d0aa8ce7bdef6c3f71817e1635b7e2fdbbfbd568e75d3a0783" - } - ], - "purl": "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/jsummers/gobmp", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/nfnt/resize@v0.0.0-20180221191011-83c6a9932646?type=module", - "type": "library", - "name": "github.com/nfnt/resize", - "version": "v0.0.0-20180221191011-83c6a9932646", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "cd8c81903fe4f6c783d80edfb22e8ea362df15901e8638d0304440bd92c40e74" - } - ], - "purl": "pkg:golang/github.com/nfnt/resize@v0.0.0-20180221191011-83c6a9932646?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/nfnt/resize", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "0BSD" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/nicksnyder/go-i18n/v2@v2.5.1?type=module", - "type": "library", - "name": "github.com/nicksnyder/go-i18n/v2", - "version": "v2.5.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "231b4fc58b11f46a7ad1c1978dfb91fe5953a95f1a60cb02e3bdb30f40f5bc79" - } - ], - "purl": "pkg:golang/github.com/nicksnyder/go-i18n/v2@v2.5.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/nicksnyder/go-i18n", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/pelletier/go-toml/v2@v2.2.3?type=module", - "type": "library", - "name": "github.com/pelletier/go-toml/v2", - "version": "v2.2.3", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "626787c8b63c98559b764356c29afea882f66c4a93d28f79592764347bcbd763" - } - ], - "purl": "pkg:golang/github.com/pelletier/go-toml/v2@v2.2.3?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/pelletier/go-toml", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "type": "library", - "name": "github.com/pmezard/go-difflib", - "version": "v1.0.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "e030700c4d0d1b24280476cb4183f04943e808c591e41133224fdfd6565b0103" - } - ], - "purl": "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/pmezard/go-difflib", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/rymdport/portal@v0.3.0?type=module", - "type": "library", - "name": "github.com/rymdport/portal", - "version": "v0.3.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "4111dcc0ac31de463925341cb15866842dd31aa1906fd2c582154d532f00741f" - } - ], - "purl": "pkg:golang/github.com/rymdport/portal@v0.3.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/rymdport/portal", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "Apache-2.0" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/sagikazarmark/locafero@v0.7.0?type=module", - "type": "library", - "name": "github.com/sagikazarmark/locafero", - "version": "v0.7.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "e4caa90ec4c6343858f2c1a9d00a30c9fd2a2ac3eb85ec1a2d2b056a874f732a" - } - ], - "purl": "pkg:golang/github.com/sagikazarmark/locafero@v0.7.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/sagikazarmark/locafero", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/sourcegraph/conc@v0.3.0?type=module", - "type": "library", - "name": "github.com/sourcegraph/conc", - "version": "v0.3.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "3904db6ede8fef62f6d14a809175ee2ce8fbf4b7c46a743e61014da4b03dc92a" - } - ], - "purl": "pkg:golang/github.com/sourcegraph/conc@v0.3.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/sourcegraph/conc", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/spf13/afero@v1.12.0?type=module", - "type": "library", - "name": "github.com/spf13/afero", - "version": "v1.12.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "51c38fc910587339859facafa61c649fd644398eb9729c0629be662f7ea6aeab" - } - ], - "purl": "pkg:golang/github.com/spf13/afero@v1.12.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/spf13/afero", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "Apache-2.0" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/spf13/cast@v1.7.1?type=module", - "type": "library", - "name": "github.com/spf13/cast", - "version": "v1.7.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "72e3446a005010758dd459db1848c25cbdaccd8117a9f24f6cfd8735469c6bd6" - } - ], - "purl": "pkg:golang/github.com/spf13/cast@v1.7.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/spf13/cast", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/spf13/pflag@v1.0.6?type=module", - "type": "library", - "name": "github.com/spf13/pflag", - "version": "v1.0.6", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "8c5cc718b18095bdebbb12c1f0c85b23a03cf80417ff6796e2a7b23595cda76a" - } - ], - "purl": "pkg:golang/github.com/spf13/pflag@v1.0.6?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/spf13/pflag", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/spf13/viper@v1.20.0?type=module", - "type": "library", - "name": "github.com/spf13/viper", - "version": "v1.20.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "cebc48c91dd14083ac6ab22b80bf3eb00bc02d7ba5f637843dad3a6343e1eaf6" - } - ], - "purl": "pkg:golang/github.com/spf13/viper@v1.20.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/spf13/viper", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/srwiley/oksvg@v0.0.0-20221011165216-be6e8873101c?type=module", - "type": "library", - "name": "github.com/srwiley/oksvg", - "version": "v0.0.0-20221011165216-be6e8873101c", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "926f06a6842eb74e5e6371a261611e75b4d3d2a9d2c6b0a3b156dbef2298d4a1" - } - ], - "purl": "pkg:golang/github.com/srwiley/oksvg@v0.0.0-20221011165216-be6e8873101c?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/srwiley/oksvg", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module", - "type": "library", - "name": "github.com/srwiley/rasterx", - "version": "v0.0.0-20220730225603-2ab79fcdd4ef", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "0a1e90f80654c4304256a76423c152a45c990ed09505cd9599e8dd36b9b9ad14" - } - ], - "purl": "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/srwiley/rasterx", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-3-Clause" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "type": "library", - "name": "github.com/stretchr/testify", - "version": "v1.10.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "5efe5eac18d3c1eff9231a94413757bf9920988bdb1e8dd0432470849b0e7c90" - } - ], - "purl": "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/stretchr/testify", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/subosito/gotenv@v1.6.0?type=module", - "type": "library", - "name": "github.com/subosito/gotenv", - "version": "v1.6.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "f4d9530dcd454ece2abb40c3abb004b533cdc3a4959bbb8132c50252300121ff" - } - ], - "purl": "pkg:golang/github.com/subosito/gotenv@v1.6.0?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/subosito/gotenv", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/github.com/yuin/goldmark@v1.7.8?type=module", - "type": "library", - "name": "github.com/yuin/goldmark", - "version": "v1.7.8", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "88444c2e7d3f409787161c52b77a7a3de37d9869ef20a4a91bd618a2b0cc9e27" - } - ], - "purl": "pkg:golang/github.com/yuin/goldmark@v1.7.8?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/yuin/goldmark", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "type": "library", - "name": "go.uber.org/atomic", - "version": "v1.9.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "102984f019ff5854d8c045bf6e9283dccf15b51ff34156dabc0a1a942d4f6321" - } - ], - "purl": "pkg:golang/go.uber.org/atomic@v1.9.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/go.uber.org/multierr@v1.9.0?type=module", - "type": "library", - "name": "go.uber.org/multierr", - "version": "v1.9.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "edf23073f66d4b4abef9581c7ea143c5205956ffd7a38f7f4989c316ea54c252" - } - ], - "purl": "pkg:golang/go.uber.org/multierr@v1.9.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "MIT" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "type": "library", - "name": "golang.org/x/image", - "version": "v0.24.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "00def346056c6ef9937cdcaa21b6ceada60bf264b070a9dc123f287e383370c4" - } - ], - "purl": "pkg:golang/golang.org/x/image@v0.24.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-Source-Code" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "type": "library", - "name": "golang.org/x/net", - "version": "v0.33.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "ef84981e557c0488072050bf2eb6243862302f5f5e4d85d0e7073a4c1b8edfa2" - } - ], - "purl": "pkg:golang/golang.org/x/net@v0.33.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-Source-Code" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "type": "library", - "name": "golang.org/x/sys", - "version": "v0.30.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "423912c0fff7e9adb48c5616912b9ed58c17ccb9ac57919fabb122cbbd82d6e7" - } - ], - "purl": "pkg:golang/golang.org/x/sys@v0.30.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-Source-Code" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "type": "library", - "name": "golang.org/x/text", - "version": "v0.22.0", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "6e87eaee6dff1c016f6c5e758f3dd0f702e0de392f48fba266efe90f55f082d3" - } - ], - "purl": "pkg:golang/golang.org/x/text@v0.22.0?type=module\u0026goos=linux\u0026goarch=amd64", - "evidence": { - "licenses": [ - { - "license": { - "id": "BSD-Source-Code" - } - } - ] - } - }, - { - "bom-ref": "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module", - "type": "library", - "name": "gopkg.in/yaml.v3", - "version": "v3.0.1", - "scope": "required", - "hashes": [ - { - "alg": "SHA-256", - "content": "7f1566fc6cc0cc45aa2c7baf72d23dd4a4bd8613669963a85aed174d8252ec20" - } - ], - "purl": "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module\u0026goos=linux\u0026goarch=amd64", - "externalReferences": [ - { - "url": "https://github.com/go-yaml/yaml", - "type": "vcs" - } - ], - "evidence": { - "licenses": [ - { - "license": { - "id": "Apache-2.0" - } - } - ] - } - } - ], - "dependencies": [ - { - "ref": "pkg:golang/jws@v0.6.0?type=module", - "dependsOn": [ - "pkg:golang/fyne.io/fyne/v2@v2.6.0-alpha1?type=module", - "pkg:golang/fyne.io/tools@v1.0.0-alpha1?type=module", - "pkg:golang/github.com/spf13/viper@v1.20.0?type=module" - ] - }, - { - "ref": "pkg:golang/fyne.io/fyne/v2@v2.6.0-alpha1?type=module", - "dependsOn": [ - "pkg:golang/fyne.io/systray@v1.11.0?type=module", - "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module", - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/fredbi/uri@v1.1.0?type=module", - "pkg:golang/github.com/fsnotify/fsnotify@v1.8.0?type=module", - "pkg:golang/github.com/fyne-io/gl-js@v0.1.0?type=module", - "pkg:golang/github.com/fyne-io/glfw-js@v0.1.0?type=module", - "pkg:golang/github.com/fyne-io/image@v0.1.0?type=module", - "pkg:golang/github.com/go-gl/gl@v0.0.0-20231021071112-07e5d0ea2e71?type=module", - "pkg:golang/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20240506104042-037f3cc74f2a?type=module", - "pkg:golang/github.com/go-text/render@v0.2.0?type=module", - "pkg:golang/github.com/go-text/typesetting@v0.2.1?type=module", - "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module", - "pkg:golang/github.com/jeandeaual/go-locale@v0.0.0-20241217141322-fcc2cadd6f08?type=module", - "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module", - "pkg:golang/github.com/nfnt/resize@v0.0.0-20180221191011-83c6a9932646?type=module", - "pkg:golang/github.com/nicksnyder/go-i18n/v2@v2.5.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/rymdport/portal@v0.3.0?type=module", - "pkg:golang/github.com/srwiley/oksvg@v0.0.0-20221011165216-be6e8873101c?type=module", - "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/github.com/yuin/goldmark@v1.7.8?type=module", - "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/fyne.io/systray@v1.11.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module" - ] - }, - { - "ref": "pkg:golang/fyne.io/tools@v1.0.0-alpha1?type=module", - "dependsOn": [ - "pkg:golang/fyne.io/fyne/v2@v2.6.0-alpha1?type=module", - "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module", - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/fyne-io/image@v0.1.0?type=module", - "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module", - "pkg:golang/github.com/nfnt/resize@v0.0.0-20180221191011-83c6a9932646?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module" - }, - { - "ref": "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module" - }, - { - "ref": "pkg:golang/github.com/fredbi/uri@v1.1.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/fsnotify/fsnotify@v1.8.0?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/sys@v0.30.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/fyne-io/gl-js@v0.1.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/go-gl/gl@v0.0.0-20231021071112-07e5d0ea2e71?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/fyne-io/glfw-js@v0.1.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20240506104042-037f3cc74f2a?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/fyne-io/image@v0.1.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/go-gl/gl@v0.0.0-20231021071112-07e5d0ea2e71?type=module" - }, - { - "ref": "pkg:golang/github.com/go-gl/glfw/v3.3/glfw@v0.0.0-20240506104042-037f3cc74f2a?type=module" - }, - { - "ref": "pkg:golang/github.com/go-text/render@v0.2.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/go-text/typesetting@v0.2.1?type=module", - "pkg:golang/github.com/srwiley/oksvg@v0.0.0-20221011165216-be6e8873101c?type=module", - "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module", - "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/go-text/typesetting@v0.2.1?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/go-viper/mapstructure/v2@v2.2.1?type=module" - }, - { - "ref": "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module" - }, - { - "ref": "pkg:golang/github.com/jeandeaual/go-locale@v0.0.0-20241217141322-fcc2cadd6f08?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/jsummers/gobmp@v0.0.0-20230614200233-a9de23ed2e25?type=module" - }, - { - "ref": "pkg:golang/github.com/nfnt/resize@v0.0.0-20180221191011-83c6a9932646?type=module" - }, - { - "ref": "pkg:golang/github.com/nicksnyder/go-i18n/v2@v2.5.1?type=module", - "dependsOn": [ - "pkg:golang/github.com/BurntSushi/toml@v1.4.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/pelletier/go-toml/v2@v2.2.3?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module" - }, - { - "ref": "pkg:golang/github.com/rymdport/portal@v0.3.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/godbus/dbus/v5@v5.1.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/sagikazarmark/locafero@v0.7.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/sourcegraph/conc@v0.3.0?type=module", - "pkg:golang/github.com/spf13/afero@v1.12.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "pkg:golang/go.uber.org/multierr@v1.9.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/sourcegraph/conc@v0.3.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "pkg:golang/go.uber.org/multierr@v1.9.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/spf13/afero@v1.12.0?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/spf13/cast@v1.7.1?type=module" - }, - { - "ref": "pkg:golang/github.com/spf13/pflag@v1.0.6?type=module" - }, - { - "ref": "pkg:golang/github.com/spf13/viper@v1.20.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/fsnotify/fsnotify@v1.8.0?type=module", - "pkg:golang/github.com/go-viper/mapstructure/v2@v2.2.1?type=module", - "pkg:golang/github.com/pelletier/go-toml/v2@v2.2.3?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/sagikazarmark/locafero@v0.7.0?type=module", - "pkg:golang/github.com/sourcegraph/conc@v0.3.0?type=module", - "pkg:golang/github.com/spf13/afero@v1.12.0?type=module", - "pkg:golang/github.com/spf13/cast@v1.7.1?type=module", - "pkg:golang/github.com/spf13/pflag@v1.0.6?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/github.com/subosito/gotenv@v1.6.0?type=module", - "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "pkg:golang/go.uber.org/multierr@v1.9.0?type=module", - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/srwiley/oksvg@v0.0.0-20221011165216-be6e8873101c?type=module", - "dependsOn": [ - "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module", - "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/srwiley/rasterx@v0.0.0-20220730225603-2ab79fcdd4ef?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/image@v0.24.0?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/subosito/gotenv@v1.6.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/github.com/yuin/goldmark@v1.7.8?type=module" - }, - { - "ref": "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module" - ] - }, - { - "ref": "pkg:golang/go.uber.org/multierr@v1.9.0?type=module", - "dependsOn": [ - "pkg:golang/github.com/davecgh/go-spew@v1.1.1?type=module", - "pkg:golang/github.com/pmezard/go-difflib@v1.0.0?type=module", - "pkg:golang/github.com/stretchr/testify@v1.10.0?type=module", - "pkg:golang/go.uber.org/atomic@v1.9.0?type=module", - "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - ] - }, - { - "ref": "pkg:golang/golang.org/x/image@v0.24.0?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/golang.org/x/net@v0.33.0?type=module", - "dependsOn": [ - "pkg:golang/golang.org/x/sys@v0.30.0?type=module", - "pkg:golang/golang.org/x/text@v0.22.0?type=module" - ] - }, - { - "ref": "pkg:golang/golang.org/x/sys@v0.30.0?type=module" - }, - { - "ref": "pkg:golang/golang.org/x/text@v0.22.0?type=module" - }, - { - "ref": "pkg:golang/gopkg.in/yaml.v3@v3.0.1?type=module" - } - ] -}