tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop

Browse Source
This commit is contained in:
Michael 2019-05-27 16:54:01 +02:00
commit 5bc407a2fb
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -15,6 +15,11 @@ repositories {
mavenCentral() mavenCentral()
} }
bootWar{
baseName = 'buga19geocachingbackend'
archiveName 'buga19geocachingbackend.war'
}
dependencies { dependencies {
compile project('labswp_2019_sose_geocaching_frontend') compile project('labswp_2019_sose_geocaching_frontend')
//Java Spring //Java Spring

2
labswp_2019_sose_geocaching_frontend/build.gradle
View File

@ -18,6 +18,8 @@ war {
from 'web/' // adds a file-set to the root of the archive from 'web/' // adds a file-set to the root of the archive
webInf { from 'WEB-INF' } // adds a file-set to the WEB-INF dir. webInf { from 'WEB-INF' } // adds a file-set to the WEB-INF dir.
webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml webXml = file('WEB-INF/web.xml') // copies a file to WEB-INF/web.xml
baseName = 'buga19geocaching'
archiveName 'buga19geocaching.war'
} }
buildDir '../build' buildDir '../build'

2
labswp_2019_sose_geocaching_frontend/frontend/quasar.conf.js
View File

@ -120,7 +120,7 @@ module.exports = function (ctx) {
} }
: { // Base URL for API-Calls: PRODUCTION (build) : { // Base URL for API-Calls: PRODUCTION (build)
//API: JSON.stringify('http://localhost:8080'), //API: JSON.stringify('http://localhost:8080'),
API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocaching'), API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19geocachingbackend'),
USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement') USER_API: JSON.stringify('https://seserver.se.hs-heilbronn.de:9443/buga19usermanagement')
} }
}, },