statisticsnorway
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 1 deletion b/‎.gitignore‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.nais/test/klass-api.yaml‎
Lines changed: 4 additions & 4 deletions b/‎.nais/test/klass-api.yaml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Makefile‎
Lines changed: 9 additions & 26 deletions b/‎Makefile‎
Lines changed: 9 additions & 26 deletions
diff --git a/‎README.md‎
Lines changed: 15 additions & 43 deletions b/‎README.md‎
Lines changed: 15 additions & 43 deletions
diff --git a/‎build_tools/checkstyle.xml‎
Lines changed: 0 additions & 164 deletions b/‎build_tools/checkstyle.xml‎
Lines changed: 0 additions & 164 deletions
@@ -47,7 +47,6 @@ pgdata/
 /out/
 .designer/designer-theme.css
 klass.log*
-/.checkstyle
 .dccache
 
 **/initdb/*.sql
@@ -27,9 +27,7 @@ spec:
           - name: klass
   env:
     - name: SPRING_PROFILES_ACTIVE
-      value: api, postgres, solr-remote, skip-indexing
-    - name: SPRING_DATA_SOLR_HOST
-      value: http://klass-solr/solr
+      value: api, postgres, remote-open-search
     - name: KLASS_ENV_CLIENT_KLASS_MAIL_URL
       value: http://klass-mail
     - name: JAVA_TOOL_OPTIONS
@@ -38,8 +36,10 @@ spec:
   accessPolicy:
     outbound:
       rules:
-        - application: klass-solr
         - application: klass-mail
+  openSearch:
+    access: readwrite
+    instance: klass-search
 
   prometheus:
     enabled: true
 
@@ -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
@@ -137,11 +121,10 @@ logs-klass-api:
 stop-klass-api-docker:
 	docker compose $(COMPOSE_FILE) --profile api down -v
 
-.PHONY: start-klass-api-search-docker
-start-klass-api-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-search up --build -d
-
-.PHONY: stop-klass-api-search-docker
-stop-klass-api-search-docker:
-	docker compose $(COMPOSE_FILE) --profile api-search down -v
+.PHONY: start-klass-api-open-search-docker
+start-klass-api-open-search-docker:
+	docker compose $(COMPOSE_FILE) --profile open-search up --build -d
 
+.PHONY: stop-klass-api-open-search-docker
+stop-klass-api-open-search-docker:
+	docker compose $(COMPOSE_FILE) --profile open-search down -v
@@ -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.
@@ -134,29 +117,7 @@ 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
 
@@ -172,13 +133,24 @@ Visit <http://127.0.0.1:8081/klassui>
 
 ### Spring profiles
 
-Klass API and Klass Forvaltning utilize Spring boot and heavily rely on Spring Profiles to make development and debugging easier. See _application.properties_ for the available profiles.
+Klass API and Klass Forvaltning utilize Spring boot and heavily rely on Spring Profiles to make development and debugging easier.
+below is a quick summary of the profiles available (see _application.properties_ for more details)
+
+```
+# Application profiles:
+#----------------------
+# Profiles for production
+#   production          = no test beans and only Active Directory login
+#
+# 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
+```
 
 ### 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).
 
 ### Run / Debug