aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverws
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-10-29 14:35:42 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-10-29 14:35:42 +0100
commit9eba138d47662ce5acdb807ab1102cc44cca0550 (patch)
tree9c5e5b4d677ef461be60d631af0ae5db038cf1fb /spss/server/serverws
parent35f1f5027aab325f3ccf8e80ef029d26f0d19847 (diff)
parent08f30a3dad9cef45d6fea0ce7a6dcb90b6b6ccde (diff)
downloadmoa-id-spss-9eba138d47662ce5acdb807ab1102cc44cca0550.tar.gz
moa-id-spss-9eba138d47662ce5acdb807ab1102cc44cca0550.tar.bz2
moa-id-spss-9eba138d47662ce5acdb807ab1102cc44cca0550.zip
Merge remote-tracking branch 'remotes/origin/afitzek.moaspss-cert-rest-service' into moa-2.1-Snapshot
Diffstat (limited to 'spss/server/serverws')
-rw-r--r--spss/server/serverws/src/main/webapp/WEB-INF/web.xml14
1 files changed, 11 insertions, 3 deletions
diff --git a/spss/server/serverws/src/main/webapp/WEB-INF/web.xml b/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
index b68ee850e..5de9f1d9c 100644
--- a/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
+++ b/spss/server/serverws/src/main/webapp/WEB-INF/web.xml
@@ -10,9 +10,7 @@
<servlet>
<servlet-name>ConfigurationServlet</servlet-name>
<display-name>MOA Configuration Servlet</display-name>
- <servlet-class>
- at.gv.egovernment.moa.spss.server.service.ConfigurationServlet
- </servlet-class>
+ <servlet-class>at.gv.egovernment.moa.spss.server.service.ConfigurationServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
@@ -22,6 +20,12 @@
org.apache.axis.transport.http.AxisServlet
</servlet-class>
</servlet>
+ <servlet>
+ <servlet-name>CertificateProviderServlet</servlet-name>
+ <display-name>MOA Certificate Provider Servlet</display-name>
+ <servlet-class>at.gv.egovernment.moa.spss.server.service.CertificateProviderServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/services/*</url-pattern>
@@ -30,6 +34,10 @@
<servlet-name>ConfigurationServlet</servlet-name>
<url-pattern>/ConfigurationUpdate</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CertificateProviderServlet</servlet-name>
+ <url-pattern>/Certificate</url-pattern>
+ </servlet-mapping>
<security-constraint>
<web-resource-collection>