Merges Injector

Welcome to the new world boys.
2019-06-06 20:47:41 -04:00
parent 79ed69ccdf
commit 882be3cb71
3613 changed files with 193663 additions and 158070 deletions
--- a/http-service/src/test/resources/application-test.yaml
+++ b/http-service/src/test/resources/application-test.yaml
@@ -1,17 +0,0 @@
-# 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/src/test/resources/net/runelite/http/service/worlds/worldlist
+++ b/http-service/src/test/resources/net/runelite/http/service/worlds/worldlist