merge branch

Author: tilen1976

.gitignore

@@ -47,7 +47,6 @@ pgdata/
 /out/
 .designer/designer-theme.css
 klass.log*
-/.checkstyle
 .dccache
 
 **/initdb/*.sql

Makefile

@@ -54,27 +54,19 @@ build-clean-klass-api:
  	popd; \
 	${sdk} env clear
 
-.PHONY: run-klass-forvaltning-local
-run-klass-forvaltning-local:
-	pushd klass-forvaltning && \
-	${sdk} env && \
-	mvn spring-boot\:run; \
-	popd; \
-	${sdk} env clear
-
 .PHONY: run-klass-forvaltning-local-postgres
 run-klass-forvaltning-local-postgres:
 	pushd klass-forvaltning && \
 	${sdk} env && \
-	mvn spring-boot\:run  -Dspring.profiles.active=postgres-local,hardcoded-user,embedded-solr,frontend,skip-indexing,small-import,ad-offline; \
+	mvn spring-boot\:run  -Dspring-boot.run.profiles=frontend,postgres-local,hardcoded-user,mock-search,mock-mailserver,small-import,skip-indexing; \
 	popd; \
 	${sdk} env clear
 
 .PHONY: run-klass-forvaltning-local-postgres-search
 run-klass-forvaltning-local-postgres-search:
 	pushd klass-forvaltning && \
 	${sdk} env && \
-	mvn spring-boot\:run -Dspring.profiles.active=postgres-local,hardcoded-user,frontend,skip-indexing,small-import,ad-offline,remote-solr -Dklass.env.search.solr.url=http://localhost:8983/solr/; \
+	mvn spring-boot\:run -Dspring-boot.run.profiles=frontend,postgres-local,hardcoded-user,mock-mailserver,small-import,skip-indexing,remote-solr -Dklass.env.search.solr.url=http://localhost:8983/solr/; \
 	popd; \
 	${sdk} env clear
 
@@ -83,19 +75,11 @@ run-klass-forvaltning-local-postgres-search:
 run-klass-api-local-postgres:
 	pushd klass-api && \
 	${sdk} env && \
-	mvn spring-boot\:run  -Dspring.profiles.active=postgres-local,hardcoded-user,embedded-solr,mock-mailserver,api,skip-indexing,small-import,ad-offline; \
+	mvn spring-boot\:run  -Dspring-boot.run.profiles=api,postgres-local,hardcoded-user,mock-search,mock-mailserver,small-import; \
 	popd; \
 	${sdk} env clear
 
 
-# The environment variable KLASS_ENV_SECURITY_IGNORED must be set to "/**" in order to skip authentication
-run-klass-api-local-mariadb:
-	pushd klass-api && \
-	${sdk} env && \
-	mvn spring-boot\:run -Dspring.profiles.active=mariadb,hardcoded-user,embedded-solr,mock-mailserver,skip-indexing,small-import,ad-offline; \
-	popd; \
-	${sdk} env clear
-
 .PHONY: start-klass-forvaltning-docker
 start-klass-forvaltning-docker:
 	docker compose $(COMPOSE_FILE) --profile frontend up --build -d
@@ -152,7 +136,3 @@ start-klass-api-open-search-docker:
 .PHONY: stop-klass-api-open-search-docker
 stop-klass-api-open-search-docker:
 	docker compose $(COMPOSE_FILE) --profile api-open-search down -v
-
-.PHONY: logs-klass-api-open-search-docker
-logs-klass-api-open-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-open-search logs --tail=100 -f klass-api-open-search

README.md

@@ -27,23 +27,6 @@ klass-forvaltning/target/klass-forvaltning-{Version}.war
 klass-solr/klass-solr-{Version}.zip (WiP)
 ```
 
-## Server configuration
-
-Klass was made with Tomcat in mind and configuration on servers are done in `tomcat.conf` (usually found in ~tomcat/conf)
-variables in `application properties` will be overridden/replaced with properties found in `tomcat.conf`
-ex. the value for `klass.env.mariadb.password` will be replaced with the value from `KLASS_ENV_MARIADB_PASSWORD`.
-
-please note that `.` is replaced with `_` in the tomcat config.
-
-A typical `tomcat.conf` would contain the following
-
-```
-SPRING_PROFILES_ACTIVE=mariadb
-KLASS_ENV_MARIADB_INSTANCE=mysql-server
-KLASS_ENV_MARIADB_PASSWORD=Password
-KLASS_ENV_LOGGING_PATH=/var/log/tomcat
-```
-
 ## Database
 
 Klass is configured to use Flyway for database initialising and migration.
@@ -81,6 +64,7 @@ This may be done by generating a Personal Access Token (classic) on GitHub with
 ```
 
 Colima should have at least 5G memory and the project folder must be mounted. Change this in `~/.colima/default/colima.yaml` e.g.
+
 ```yaml
 memory: 5
 ...
@@ -98,27 +82,12 @@ Each app has an `.sdkmanrc` file which may be used to configure the Java version
 ### Klass API
 
 #### Build
+
 Build the app: `make build-klass-api`
 
 #### Docker compose
-Service `klass-api` requires a prebuild tagged image. 
 
-Run command in `klass-api` module:
-```
-docker build -t target-postgres-image:latest .
-```
-This service depends on a Postgresql db container. 
-
-For testing with MariaDB build `klass-api` with `klass-shared` version `3.0.5-master-SNAPSHOT`.
-
-This will build klass-api without running tests: 
-```
-mvn clean install -DskipTests -pl klass-api
-```
-And build mariadb image in klass-api module:
-```
-docker build -t source-mariadb-image:latest .
-```
+TODO
 
 ### Klass Forvaltning
 
@@ -142,24 +111,18 @@ below is a quick summary of the profiles available (see _application.properties_
 #----------------------
 # Profiles for production
 #   production          = no test beans and only Active Directory login
-#   mariadb             = use remote mariaDB database
 #   remote-solr         = use remote Solr server
 #
 # Profiles for development
 #   ad-offline          = will only use test/embeded AD (apacheDS) [Forvaltning only]
 #   small-import        = imports a small number of classifications from legacy system, useful during development
 #   mock-mailserver     = outgoing emails are only logged
-#   h2                  = use h2 database (stored on your filesystem)
-#   h2-inmemory         = use h2 database but keep everything in memory only.
 #   embedded-solr       = run an instance of solr as part of the application (no need to run a separate solr application)
 ```
 
 ### Build profiles
 
-we have created custom profiles for time consuming tests that can be toggled on and off to help speed up compile time during development.
 The profile named `documentation` will generate API documentation with AsciiDoc (default: enabled)
-We also have a custom profile (`testbench`) for running GUI tests using TestBench (Vaadin licensed product).
-There's also a `checkstyle` and a `findbugs` for use with Jenkins to create code quality reports.
 
 ### Run / Debug