rename tiltak

.gitignore

@@ -276,7 +276,7 @@ jdk_17_maven/em/embedded/rest/signal-server/target/
 jdk_17_maven/cs/rest/familie-tilbake/target/
 jdk_17_maven/em/embedded/rest/familie-tilbake/target/
 jdk_17_maven/cs/rest/familie-ba-sak/target/
-jdk_17_maven/cs/rest/tiltaksgjennomforing-api/target/
+jdk_17_maven/cs/rest/tiltaksgjennomforing/target/
 jdk_17_maven/em/embedded/rest/familie-ba-sak/target/
 
 /jdk_8_maven/em/embedded/grpc/ncs/target/
@@ -324,8 +324,8 @@ scripts/dockerize/dockerfiles
 /jdk_21_maven/em/external/rest/person-controller/target/
 /jdk_11_maven/em/embedded/rest/tracking-system/target/
 /jdk_11_maven/em/external/rest/tracking-system/target/
-/jdk_17_maven/em/embedded/rest/tiltaksgjennomforing-api/target/
-/jdk_17_maven/em/external/rest/tiltaksgjennomforing-api/target/
+/jdk_17_maven/em/embedded/rest/tiltaksgjennomforing/target/
+/jdk_17_maven/em/external/rest/tiltaksgjennomforing/target/
 
 jdk_17_maven/cs/rest/ohsome-api/target/
 jdk_17_maven/em/embedded/rest/ohsome-api/target/

README.md

@@ -124,7 +124,7 @@ For simplicity, all schemas are also available as JSON/YML files under the folde
 
 * **Spring Boot Restful API Example** (MIT), [jdk_17_maven/cs/rest/spring-rest-example](jdk_17_maven/cs/rest/spring-rest-example), from [https://github.com/phantasmicmeans/spring-boot-restful-api-example](https://github.com/phantasmicmeans/spring-boot-restful-api-example)
 
-* **Tiltaksgjennomføring API** (MIT), [jdk_17_maven/cs/rest/tiltaksgjennomforing-api](jdk_17_maven/cs/rest/tiltaksgjennomforing-api), from [https://github.com/navikt/tiltaksgjennomforing-api](https://github.com/navikt/tiltaksgjennomforing-api)
+* **Tiltaksgjennomføring** (MIT), [jdk_17_maven/cs/rest/tiltaksgjennomforing](jdk_17_maven/cs/rest/tiltaksgjennomforing), from [https://github.com/navikt/tiltaksgjennomforing-api](https://github.com/navikt/tiltaksgjennomforing-api)
 
 * **User Management** (MIT), [jdk_8_maven/cs/rest/original/user-management](jdk_8_maven/cs/rest/original/user-management), from [https://github.com/andreagiassi/microservice-rbac-user-management](https://github.com/andreagiassi/microservice-rbac-user-management)
 

dockerfiles/tiltaksgjennomforing-api.dockerfile → dockerfiles/tiltaksgjennomforing.dockerfile

@@ -1,6 +1,6 @@
 FROM amazoncorretto:17-alpine-jdk
 
-COPY ./dist/tiltaksgjennomforing-api-sut.jar .
+COPY ./dist/tiltaksgjennomforing-sut.jar .
 COPY ./dist/jacocoagent.jar .
 
 
@@ -11,7 +11,7 @@ COPY ./dist/jacocoagent.jar .
 ENTRYPOINT \
     java \
 #    unfortunately dumponexit is completely unreliable in Docker :(
-#    -javaagent:jacocoagent.jar=destfile=./jacoco/tiltaksgjennomforing-api__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
+#    -javaagent:jacocoagent.jar=destfile=./jacoco/tiltaksgjennomforing__${TOOL}__${RUN}__jacoco.exec,append=false,dumponexit=true \
     -javaagent:jacocoagent.jar=output=tcpserver,address=*,port=6300,append=false,dumponexit=false \
-     -jar tiltaksgjennomforing-api-sut.jar \
+     -jar tiltaksgjennomforing-sut.jar \
     --server.port=8080 --spring.profiles.active=dev-gcp-labs --spring.datasource.driverClassName=org.postgresql.Driver --spring.sql.init.platform=postgres --no.nav.security.jwt.issuer.aad.discoveryurl=http://mock-oauth2-server:8083/aad/.well-known/openid-configuration --no.nav.security.jwt.issuer.aad.accepted_audience=aad --no.nav.security.jwt.issuer.system.discoveryurl=http://mock-oauth2-server:8083/system/.well-known/openid-configuration --no.nav.security.jwt.issuer.system.accepted_audience=system --no.nav.security.jwt.issuer.tokenx.discoveryurl=http://mock-oauth2-server:8083/tokenx/.well-known/openid-configuration --no.nav.security.jwt.issuer.tokenx.accepted_audience=tokenx --management.server.port=-1 --server.ssl.enabled=false --spring.datasource.url=jdbc:postgresql://db:5432/tiltaksgjennomforing  --spring.datasource.username=postgres --spring.datasource.password=password --sentry.logging.enabled=false --sentry.environment=local --logging.level.root=OFF --logging.config=classpath:logback-spring.xml --logging.level.org.springframework=INFO

dockerfiles/tiltaksgjennomforing-api.yaml → dockerfiles/tiltaksgjennomforing.yaml

@@ -1,7 +1,7 @@
 services:
-  sut-tiltaksgjennomforing-api:
+  sut-tiltaksgjennomforing:
     build:
-      dockerfile: ./dockerfiles/tiltaksgjennomforing-api.dockerfile
+      dockerfile: ./dockerfiles/tiltaksgjennomforing.dockerfile
       context: ..
 #    environment:
 #      TOOL: ${TOOL:-undefined}
@@ -34,6 +34,5 @@ services:
       SERVER_PORT: 8083
       JSON_CONFIG_PATH: /app/mockoauth2.json
     volumes:
-      - ../scripts/dockerize/data/additional_files/tiltaksgjennomforing-api/mockoauth2.json:/app/mockoauth2.json
-    ports:
-        - "8083:8083"
+      - ../scripts/dockerize/data/additional_files/tiltaksgjennomforing/mockoauth2.json:/app/mockoauth2.json
+

jdk_17_maven/cs/rest/pom.xml

@@ -14,7 +14,7 @@
 
     <modules>
         <module>familie-ba-sak</module>
-        <module>tiltaksgjennomforing-api</module>
+        <module>tiltaksgjennomforing</module>
         <module>ohsome-api</module>
         <module>spring-rest-example</module>
 

jdk_17_maven/cs/rest/tiltaksgjennomforing-api/pom.xml → jdk_17_maven/cs/rest/tiltaksgjennomforing/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>no.nav.tag</groupId>
-    <artifactId>tiltaksgjennomforing-api</artifactId>
+    <artifactId>tiltaksgjennomforing</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 <!--    <parent>-->
@@ -239,7 +239,7 @@
                         <goal>repackage</goal>
                     </goals>
                     <configuration>
-                        <finalName>tiltaksgjennomforing-api</finalName>
+                        <finalName>tiltaksgjennomforing</finalName>
                         <classifier>sut</classifier>
                     </configuration>
                 </execution>