client: Rebase further

2019-10-03 06:00:19 +02:00
parent 3eb6156ca4
commit 55839f684c
47 changed files with 111 additions and 64 deletions
--- a/http-service-openosrs/src/test/resources/application-test.yaml
+++ b/http-service-openosrs/src/test/resources/application-test.yaml
@@ -0,0 +1,17 @@
+# Use in-memory database for tests
+datasource:
+  runelite:
+    jndiName:
+    driverClassName: org.h2.Driver
+    type: org.h2.jdbcx.JdbcDataSource
+    url: jdbc:h2:mem:runelite
+  runelite-cache:
+    jndiName:
+    driverClassName: org.h2.Driver
+    type: org.h2.jdbcx.JdbcDataSource
+    url: jdbc:h2:mem:cache
+  runelite-tracker:
+    jndiName:
+    driverClassName: org.h2.Driver
+    type: org.h2.jdbcx.JdbcDataSource
+    url: jdbc:h2:mem:xptracker
--- a/http-service-openosrs/src/test/resources/net/runelite/http/service/worlds/worldlist
+++ b/http-service-openosrs/src/test/resources/net/runelite/http/service/worlds/worldlist