aboutsummaryrefslogtreecommitdiff
path: root/id/oa/src/main/webapp
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 13:19:13 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-06-07 13:19:13 +0200
commitf660735c26170c05396e0feeac53e7dcf3c5b5df (patch)
tree2ae4bbc58f060c54150830cacdecb03dddd1123a /id/oa/src/main/webapp
parent81f86fc319e98469cc4ae65f8c4a3c8a4636ac00 (diff)
parent0cf75d5ee50f3c285a772ce96411f7bf98fe2a72 (diff)
downloadmoa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.tar.gz
moa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.tar.bz2
moa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.zip
Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java
Diffstat (limited to 'id/oa/src/main/webapp')
-rw-r--r--id/oa/src/main/webapp/WEB-INF/web.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/id/oa/src/main/webapp/WEB-INF/web.xml b/id/oa/src/main/webapp/WEB-INF/web.xml
index a42985c95..89553915a 100644
--- a/id/oa/src/main/webapp/WEB-INF/web.xml
+++ b/id/oa/src/main/webapp/WEB-INF/web.xml
@@ -5,8 +5,8 @@
<description>MOA PVP2.1 Sample OA</description>
<servlet>
+ <display-name>PVP 2.1 Authentication request builder</display-name>
<servlet-name>pvp2login</servlet-name>
- <display-name>PVP 2.1 Authentication request builder</display-name>
<servlet-class>at.gv.egovernment.moa.id.demoOA.servlet.pvp2.Authenticate</servlet-class>
</servlet>
@@ -16,8 +16,8 @@
</servlet-mapping>
<servlet>
- <servlet-name>pvp2slo</servlet-name>
<display-name>PVP 2.1 Single Log-Out request builder</display-name>
+ <servlet-name>pvp2slo</servlet-name>
<servlet-class>at.gv.egovernment.moa.id.demoOA.servlet.pvp2.SingleLogOut</servlet-class>
</servlet>
@@ -27,8 +27,8 @@
</servlet-mapping>
<servlet>
+ <display-name>Metadata</display-name>
<servlet-name>pvp2metadata</servlet-name>
- <display-name>Metadata</display-name>
<servlet-class>at.gv.egovernment.moa.id.demoOA.servlet.pvp2.BuildMetadata</servlet-class>
</servlet>
@@ -38,8 +38,8 @@
</servlet-mapping>
<servlet>
+ <display-name>Secure area</display-name>
<servlet-name>pvp2demooa</servlet-name>
- <display-name>Secure area</display-name>
<servlet-class>at.gv.egovernment.moa.id.demoOA.servlet.pvp2.DemoApplication</servlet-class>
</servlet>
@@ -49,8 +49,8 @@
</servlet-mapping>
<servlet>
+ <display-name>Mainpage</display-name>
<servlet-name>index</servlet-name>
- <display-name>Mainpage</display-name>
<servlet-class>at.gv.egovernment.moa.id.demoOA.servlet.pvp2.Index</servlet-class>
</servlet>