From 496c5fcb6b2a89c7cd1dd72268314b4e935714c6 Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Thu, 18 Apr 2019 12:48:33 +0200
Subject: [PATCH] Ready to deploy

---
 build.gradle                                            | 5 ++++-
 frontend/quasar.conf.js                                 | 2 +-
 src/main/java/hhn/labsw/bugageocaching/Application.java | 6 +++---
 src/main/resources/application.properties               | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1701aa8..90a4591 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'idea'
 apply plugin: 'com.moowork.node'
+apply plugin: 'war'
 
 group = 'de.hhn.labsw'
 version = '0.0.1-SNAPSHOT'
@@ -37,7 +38,7 @@ dependencies {
     compile 'com.googlecode.json-simple:json-simple:1.1.1'
 
 
-    //compile 'org.springframework.boot:spring-boot-starter-tomcat'
+    compile 'org.springframework.boot:spring-boot-starter-tomcat'
     //compile 'org.springframework.boot:spring-boot-starter-security'
     //compile 'org.springframework.boot:spring-boot-starter-actuator'
     //compile 'org.springframework.boot:spring-boot-starter-aop'
@@ -46,6 +47,8 @@ dependencies {
     compile group: 'org.springframework.security', name: 'spring-security-core', version: '5.1.4.RELEASE'
     //compile group: 'at.favre.lib', name: 'bcrypt', version: '{latest-version}'
 
+    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+
     //JWT
     compile 'io.jsonwebtoken:jjwt-api:0.10.5'
     runtime 'io.jsonwebtoken:jjwt-impl:0.10.5',
diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js
index f95dbf8..42e1d48 100644
--- a/frontend/quasar.conf.js
+++ b/frontend/quasar.conf.js
@@ -106,8 +106,8 @@ module.exports = function (ctx) {
           API: JSON.stringify('http://localhost:8080')
         }
         : { // Base URL for API-Calls: PRODUCTION (build)
-          API: JSON.stringify('http://se.hs-heilbronn.de:8090')
           //API: JSON.stringify('http://se.hs-heilbronn.de:8090')
+          API: JSON.stringify('http://seserver.se.hs-heilbronn.de:8090/buga19geocaching')
         }
     },
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/Application.java b/src/main/java/hhn/labsw/bugageocaching/Application.java
index 1eb29fa..f7d101c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/Application.java
+++ b/src/main/java/hhn/labsw/bugageocaching/Application.java
@@ -8,12 +8,12 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
-public class Application{
+public class Application extends SpringBootServletInitializer{
 
-  /**@Override
+  @Override
   protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
   return application.sources(Application.class);
-  }**/
+  }
 
   public static void main(String[] args) throws Exception {
     SpringApplication.run(Application.class, args);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e29f753..71acd7a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 spring.datasource.url=jdbc:mariadb://seserver.se.hs-heilbronn.de:3406/buga19Geocaching
 spring.datasource.username=BuGa19GeocachingUser
 spring.datasource.password=GeocachingPw
+spring.jmx.default-domain=buga19geocaching
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
\ No newline at end of file