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-api/src/main/webapp/WEB-INF/juick.conf.example | 6 ------
 juick-api/src/main/webapp/WEB-INF/web.xml            | 4 ----
 2 files changed, 10 deletions(-)
 delete mode 100644 juick-api/src/main/webapp/WEB-INF/juick.conf.example
 delete mode 100644 juick-api/src/main/webapp/WEB-INF/web.xml

(limited to 'juick-api/src/main/webapp')

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>
-- 
cgit v1.2.3