From 0667357bf2f3063562ad1f452988d958fdebb160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Wed, 16 Oct 2024 13:16:12 +0200
Subject: [PATCH] tomcat deployment context.xml

---
 pom.xml                              |  7 +++----
 scp.sh                               | 11 -----------
 src/main/webapp/META-INF/context.xml |  4 ++++
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100755 scp.sh
 create mode 100644 src/main/webapp/META-INF/context.xml

diff --git a/pom.xml b/pom.xml
index e286485..86ecd4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
-      <version>3.3.4</version>
     </dependency>
 
     <dependency>
@@ -68,7 +67,7 @@
   </dependencies>
 
   <build>
-    <finalName>${artifactId}</finalName>
+    <finalName>${project.artifactId}</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -82,11 +81,11 @@
               <goal>exec</goal>
             </goals>
             <configuration>
-              <executable>./scp.sh</executable>
+              <executable>/usr/bin/scp</executable>
               <arguments>
                 <argument>-P</argument>
                 <argument>2222</argument>
-                <argument>${project.build.directory}/${artifactId}.war</argument>
+                <argument>${project.build.directory}/${project.artifactId}.war</argument>
                 <argument>root@app.ph87.de:/srv/app.ph87.de/tomcat/webapps/</argument>
               </arguments>
             </configuration>
diff --git a/scp.sh b/scp.sh
deleted file mode 100755
index d431ea7..0000000
--- a/scp.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-echo -n "Upload to server [yes|NO]? "
-read -r answer
-
-if [ "$answer" == "yes" ]; then
-  echo -n "Uploading... "
-  scp "$@" && echo "DONE"
-else
-  echo "NOT uploading!"
-fi
\ No newline at end of file
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000..c055e38
--- /dev/null
+++ b/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context docBase="Data">
+  <Environment name="spring.config.location" value="classpath:/,file:./,file:./properties/Data.properties" type="java.lang.String"/>
+</Context>