artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 15:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into tesobe

Browse Source
This commit is contained in:
Everett Sochowski 2015-03-09 17:35:48 +01:00
commit 5ac9d28a88
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/props/sample.props.template
View File

@ -10,6 +10,11 @@ db.url=jdbc:postgresql://localhost:5432/dbname?user=dbusername&password=thepassw
# if this is 127.0.0.1 don't use localhost to access it.
hostname=http://127.0.0.1:8080
#this is only useful for running the api locally via RunWebApp
#if you use it, make sure this matches your hostname port!
#if you want to change the port when running via the command line, use "mvn -Djetty.port=8089 jetty:run" instead
dev.port=8089
#set this to false if you don't want the api payments call to work
payments_enabled=true
@ -51,4 +56,4 @@ allow_sandbox_account_creation=true
allow_sandbox_data_import=true
#secret key that allows access to the "data import" api. You should change this to your own secret key
sandbox_data_import_secret=09ejf09jf09efje09jfe0jw23rssnkndiu733n
sandbox_data_import_secret=09ejf09jf09efje09jfe0jw23rssnkndiu733n

3
src/test/scala/RunWebApp.scala
View File

@ -29,11 +29,12 @@ Berlin 13359, Germany
Ayoub Benali: ayoub AT tesobe DOT com
*/
import net.liftweb.util.Props
import org.eclipse.jetty.server.Server
import org.eclipse.jetty.webapp.WebAppContext
object RunWebApp extends App {
val server = new Server(8080)
val server = new Server(Props.getInt("dev.port", 8080))
val context = new WebAppContext()
context.setServer(server)