endre module navn til ebms-provider og legg til ebms-db

.github/workflows/build.yaml

@@ -47,7 +47,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: "Build and push ebms-provider Docker image"
-      run: "docker build processor --pull --tag ${IMAGE_EBMS} -f Dockerfile && docker push ${IMAGE_EBMS}"
+      run: "docker build ebms-provider --pull --tag ${IMAGE_EBMS} -f Dockerfile && docker push ${IMAGE_EBMS}"
     - name: "Build and push cpa-repo Docker image"
       run: "docker build cpa-repo --pull --tag ${IMAGE_CPA} -f Dockerfile && docker push ${IMAGE_CPA}"
     - name: "Build and push payload-processor Docker image"
@@ -63,7 +63,7 @@ jobs:
       env:
         APIKEY: "${{ secrets.NAIS_DEPLOY_APIKEY }}"
         CLUSTER: "dev-gcp"
-        RESOURCE: ".nais/processor-dev.yaml"
+        RESOURCE: ".nais/ebms-provider-dev.yaml"
         IMAGE: ${{env.IMAGE_EBMS}}
   deploy-cpa-repo:
     name: "Deploy cpa-repo to dev"
@@ -90,30 +90,4 @@ jobs:
           APIKEY: "${{ secrets.NAIS_DEPLOY_APIKEY }}"
           CLUSTER: "dev-gcp"
           RESOURCE: ".nais/payload-processor-dev.yaml"
-          IMAGE: ${{env.IMAGE_PAYLOAD}}
-#  "deployAppToDev":
-#    name: "Deploy app to dev"
-#    needs: "build"
-#    runs-on: "ubuntu-20.04"
-#    steps:
-#    - uses: "actions/checkout@v3"
-#    - name: "Deploy to DEV"
-#      uses: "nais/deploy/actions/deploy@v1"
-#      env:
-#        "APIKEY": "${{ secrets.NAIS_DEPLOY_APIKEY }}"
-#        "CLUSTER": "dev-gcp"
-#        "RESOURCE": ".nais/nais.yaml"
-#        "VARS": ".nais/dev.yaml"
-#  "deployAppToProd":
-#    name: "Deploy app to prod"
-#    needs: "deployAppToDev"
-#    runs-on: "ubuntu-20.04"
-#    steps:
-#    - uses: "actions/checkout@v3"
-#    - name: "Deploy to PROD"
-#      uses: "nais/deploy/actions/deploy@v1"
-#      env:
-#        "APIKEY": "${{ secrets.NAIS_DEPLOY_APIKEY }}"
-#        "CLUSTER": "prod-gcp"
-#        "RESOURCE": ".nais/nais.yaml"
-#        "VARS": ".nais/prod.yaml"
+          IMAGE: ${{env.IMAGE_PAYLOAD}}

processor/build.gradle.kts → ebms-provider/build.gradle.kts

@@ -10,11 +10,9 @@ plugins {
 }
 
 tasks {
-
         shadowJar {
             archiveFileName.set("app.jar")
         }
-
 }
 
 repositories {
@@ -46,5 +44,5 @@ dependencies {
 }
 
 application {
-    mainClass.set("ebxml.processor.app.AppKt")
+    mainClass.set("no.nav.emottak.ebms.AppKt")
 }

processor/src/main/kotlin/ebxml/processor/app/App.kt → ebms-provider/src/main/kotlin/no/nav/emottak/ebms/App.kt

@@ -1,7 +1,7 @@
 /*
  * This Kotlin source file was generated by the Gradle 'init' task.
  */
-package ebxml.processor.app
+package no.nav.emottak.ebms
 
 import io.ktor.http.*
 import io.ktor.http.content.*
@@ -13,8 +13,8 @@ import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import no.nav.emottak.ebms.model.EbMSAttachment
 import no.nav.emottak.ebms.model.EbMSDocument
-import no.nav.emottak.processing.EbmsMessageProcessor
-import no.nav.emottak.xml.EbmsMessageBuilder
+import no.nav.emottak.ebms.processing.EbmsMessageProcessor
+import no.nav.emottak.ebms.xml.EbmsMessageBuilder
 import kotlin.io.encoding.ExperimentalEncodingApi
 
 fun main() {

processor/src/main/kotlin/ebxml/processor/app/MessageUtils.kt → ebms-provider/src/main/kotlin/no/nav/emottak/ebms/MessageUtils.kt

@@ -1,7 +1,7 @@
 /*
  * This Kotlin source file was generated by the Gradle 'init' task.
  */
-package ebxml.processor.app
+package no.nav.emottak.ebms
 
 class MessageUtils {
     companion object {

processor/src/main/kotlin/no/nav/emottak/processing/EbmsMessageProcessor.kt → ebms-provider/src/main/kotlin/no/nav/emottak/ebms/processing/EbmsMessageProcessor.kt

@@ -1,7 +1,7 @@
-package no.nav.emottak.processing
+package no.nav.emottak.ebms.processing
 
 import no.nav.emottak.ebms.model.EbMSDocument
-import no.nav.emottak.xml.EbmsMessageBuilder
+import no.nav.emottak.ebms.xml.EbmsMessageBuilder
 
 class EbmsMessageProcessor {
 

processor/src/main/kotlin/no/nav/emottak/xml/EbmsMessageBuilder.kt → ebms-provider/src/main/kotlin/no/nav/emottak/ebms/xml/EbmsMessageBuilder.kt

@@ -1,4 +1,4 @@
-package no.nav.emottak.xml
+package no.nav.emottak.ebms.xml
 
 import no.nav.emottak.ebms.model.EbMSDocument
 import org.xmlsoap.schemas.soap.envelope.Envelope

processor/src/main/kotlin/no/nav/emottak/xml/XmlMarshaller.kt → ebms-provider/src/main/kotlin/no/nav/emottak/ebms/xml/XmlMarshaller.kt

@@ -1,4 +1,4 @@
-package no.nav.emottak.xml
+package no.nav.emottak.ebms.xml
 
 import java.io.StringWriter
 import javax.xml.bind.JAXBContext

processor/src/test/kotlin/ebxml/processor/app/XmlMarshallerTest.kt → ebms-provider/src/test/kotlin/no/nav/emottak/ebms/XmlMarshallerTest.kt

@@ -1,10 +1,10 @@
 /*
  * This Kotlin source file was generated by the Gradle "init" task.
  */
-package ebxml.processor.app
+package no.nav.emottak.ebms
 
-import no.nav.emottak.xml.marshal
-import no.nav.emottak.xml.unmarshal
+import no.nav.emottak.ebms.xml.marshal
+import no.nav.emottak.ebms.xml.unmarshal
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test

settings.gradle.kts

@@ -6,11 +6,5 @@
  * Detailed information about configuring a multi-project build in Gradle can be found
  * in the user manual at https://docs.gradle.org/8.1.1/userguide/multi_project_builds.html
  */
-
-plugins {
-    // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
-}
-
 rootProject.name = "ebxml-processor"
-include("async-recievers","cpa-repo","processor", "payload-processor")
+include("async-recievers","cpa-repo","ebms-provider", "payload-processor")