From 22fa502881b39d70dbfd7f0ce15b10ca02a0d5b1 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 1 Dec 2015 12:29:18 +0300
Subject: merge com.juick.jabber.push

---
 src/main/webapp/WEB-INF/push.conf.example |  8 ++++++++
 src/main/webapp/WEB-INF/web.xml           | 13 +++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 src/main/webapp/WEB-INF/push.conf.example

(limited to 'src/main/webapp')

diff --git a/src/main/webapp/WEB-INF/push.conf.example b/src/main/webapp/WEB-INF/push.conf.example
new file mode 100644
index 00000000..adc6597e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/push.conf.example
@@ -0,0 +1,8 @@
+mysql_host=localhost
+mysql_username=username
+mysql_database=juick
+xmpp_jid=push.juick.com
+xmpp_password=secret
+gcm_key=<Insert_GCM_key>
+apns_keystore=/path/to/apns/certificates.p12
+apns_mode=sandbox
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 16e4d30f..a71f3918 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -8,9 +8,22 @@
         <servlet-name>Main</servlet-name>
         <url-pattern>/</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/scripts.js</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/style.css</url-pattern>
+    </servlet-mapping>
     <session-config>
         <session-timeout>
             30
         </session-timeout>
     </session-config>
+    <listener>
+        <description>APNS/GCM/MPNS module</description>
+        <display-name>PushComponent</display-name>
+        <listener-class>com.juick.push.PushComponent</listener-class>
+    </listener>
 </web-app>
-- 
cgit v1.2.3