diff options
| author |  Vitaly Takmazov | 2016-06-30 15:19:50 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-06-30 15:19:50 +0300 |
| commit | 3419b77d5d87a0b500e70eccd1bb28f81c6c189f (patch) | |
| tree | bb4d9e5b6dbf4cffa815c846bed537f346d48036 /src/main | |
| parent | f741ee55323fa05a62081dce70d18a62d1e28abf (diff) | |
| parent | 799523c4019fa4f6ef6d40e77b3f949fbe742c8f (diff) | |
Merge branch 'develop' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.rss into develop
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/webapp/WEB-INF/juick.conf.example | 2 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/web.xml | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/main/webapp/WEB-INF/juick.conf.example b/src/main/webapp/WEB-INF/juick.conf.example new file mode 100644 index 00000000..2cb6f4f7 --- /dev/null +++ b/src/main/webapp/WEB-INF/juick.conf.example @@ -0,0 +1,2 @@ +datasource_driver=org.h2.Driver +datasource_url=jdbc:h2:~/test diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 00000000..a4264bb0 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,16 @@ +<?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"> + <servlet> + <servlet-name>Main</servlet-name> + <servlet-class>com.juick.rss.Main</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Main</servlet-name> + <url-pattern>/</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout> + 30 + </session-timeout> + </session-config> +</web-app> |