diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-24 13:57:41 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-02-24 13:57:41 +0100 |
| commit | 764cbf7de6caa0064719645afdfde2807c272203 (patch) | |
| tree | 555814a276b917fa6e2af00a5fa52733520fc346 /id/server/auth/src/main/webapp/WEB-INF | |
| parent | b7c4c3bbe1e0ad4f4a4789e087f78222ebda58a9 (diff) | |
| parent | f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 (diff) | |
| download | moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.tar.gz moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.tar.bz2 moa-id-spss-764cbf7de6caa0064719645afdfde2807c272203.zip | |
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'id/server/auth/src/main/webapp/WEB-INF')
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/web.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml index dadca355c..0ef8a568c 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/web.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml @@ -74,13 +74,13 @@ <description>Verify AUTH block coming from security layer</description> <servlet-class>at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet</servlet-class> </servlet> - <servlet> +<!-- <servlet> <servlet-name>ConfigurationUpdate</servlet-name> <display-name>ConfigurationUpdate</display-name> <description>Update MOA-ID Auth configuration from the configuration file</description> <servlet-class>at.gv.egovernment.moa.id.auth.servlet.ConfigurationServlet</servlet-class> - </servlet> + </servlet> --> <servlet> <servlet-name>AxisServlet</servlet-name> <display-name>Apache-Axis Servlet</display-name> @@ -196,10 +196,10 @@ <servlet-name>VerifyAuthBlock</servlet-name> <url-pattern>/VerifyAuthBlock</url-pattern> </servlet-mapping> - <servlet-mapping> +<!-- <servlet-mapping> <servlet-name>ConfigurationUpdate</servlet-name> <url-pattern>/ConfigurationUpdate</url-pattern> - </servlet-mapping> + </servlet-mapping> --> <servlet-mapping> <servlet-name>AxisServlet</servlet-name> <url-pattern>/services/*</url-pattern> @@ -235,7 +235,7 @@ <error-code>500</error-code> <location>/errorpage.jsp</location> </error-page> - <security-constraint> +<!-- <security-constraint> <web-resource-collection> <web-resource-name>ConfigurationUpdate</web-resource-name> <url-pattern>/ConfigurationUpdate</url-pattern> @@ -243,7 +243,7 @@ <auth-constraint> <role-name>moa-admin</role-name> </auth-constraint> - </security-constraint> + </security-constraint> --> <login-config> <auth-method>BASIC</auth-method> <realm-name>UserDatabase</realm-name> |