aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src/main/webapp
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-02-06 17:54:49 +0300
committerGravatar Vitaly Takmazov2018-02-08 14:29:08 +0300
commit7ed3795da542bab397ee7ed8978bde896abf5cf4 (patch)
tree0531bf226f31b7d4f428248b1f176f5ecbab0874 /juick-api/src/main/webapp
parent089f00eaf912781cebd4dc87e9c445051d0cc532 (diff)
server: merge api and ws
Diffstat (limited to 'juick-api/src/main/webapp')
-rw-r--r--juick-api/src/main/webapp/WEB-INF/juick.conf.example6
-rw-r--r--juick-api/src/main/webapp/WEB-INF/web.xml4
2 files changed, 0 insertions, 10 deletions
diff --git a/juick-api/src/main/webapp/WEB-INF/juick.conf.example b/juick-api/src/main/webapp/WEB-INF/juick.conf.example
deleted file mode 100644
index 61ebbc29..00000000
--- a/juick-api/src/main/webapp/WEB-INF/juick.conf.example
+++ /dev/null
@@ -1,6 +0,0 @@
-datasource_driver=org.h2.Driver
-datasource_url=jdbc:h2:~/test
-xmpp_host=localhost
-xmpp_port=5347
-xmpp_jid=api.localhost
-xmpp_password=secret \ No newline at end of file
diff --git a/juick-api/src/main/webapp/WEB-INF/web.xml b/juick-api/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7e1c30d0..00000000
--- a/juick-api/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
-</web-app>