From 7ed3795da542bab397ee7ed8978bde896abf5cf4 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 6 Feb 2018 17:54:49 +0300 Subject: server: merge api and ws --- juick-server/src/main/webapp/WEB-INF/juick.conf.example | 6 ++++++ juick-server/src/main/webapp/WEB-INF/web.xml | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 juick-server/src/main/webapp/WEB-INF/juick.conf.example create mode 100644 juick-server/src/main/webapp/WEB-INF/web.xml (limited to 'juick-server/src/main/webapp') diff --git a/juick-server/src/main/webapp/WEB-INF/juick.conf.example b/juick-server/src/main/webapp/WEB-INF/juick.conf.example new file mode 100644 index 00000000..61ebbc29 --- /dev/null +++ b/juick-server/src/main/webapp/WEB-INF/juick.conf.example @@ -0,0 +1,6 @@ +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-server/src/main/webapp/WEB-INF/web.xml b/juick-server/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000..7e1c30d0 --- /dev/null +++ b/juick-server/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,4 @@ + + + + -- cgit v1.2.3