diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-03-16 13:13:10 +0100 |
| commit | 3a80aa7e900c77da7625886f72ee22666ecfae23 (patch) | |
| tree | 5eef5ac02252c1f493908e34c773751987b257b1 /spss/server/serverws/WebContent | |
| parent | 226db2c5c41c149256459bf18dff4585a07e5ea1 (diff) | |
| parent | d69ba86f0855097e46e525794075f3c743e7facb (diff) | |
| download | moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.gz moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.tar.bz2 moa-id-spss-3a80aa7e900c77da7625886f72ee22666ecfae23.zip | |
Merge branch 'Branch_MOA-ID-3.2.1' into development_preview
# Conflicts:
# id/server/moa-id-commons/pom.xml
# pom.xml
Diffstat (limited to 'spss/server/serverws/WebContent')
| -rw-r--r-- | spss/server/serverws/WebContent/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | spss/server/serverws/WebContent/WEB-INF/web.xml | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/spss/server/serverws/WebContent/META-INF/MANIFEST.MF b/spss/server/serverws/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 5e9495128..000000000 --- a/spss/server/serverws/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0
-Class-Path:
-
diff --git a/spss/server/serverws/WebContent/WEB-INF/web.xml b/spss/server/serverws/WebContent/WEB-INF/web.xml deleted file mode 100644 index b3b3ad52d..000000000 --- a/spss/server/serverws/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>
- moa-spss-ws</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
|