Author: juanpablo
Date: Thu Jun 6 05:23:31 2013
New Revision: 1490148
URL: http://svn.apache.org/r1490148
Log:
oops, committed wrong version of WEB-INF/web.xml for testing
Modified:
incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml?rev=1490148&r1=1490147&r2=1490148&view=diff
==============================================================================
--- incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
(original)
+++ incubator/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Thu
Jun 6 05:23:31 2013
@@ -222,7 +222,7 @@
<location>/error/Forbidden.html</location>
</error-page>
- <!-- REMOVE ME TO ENABLE JDBC DATABASE
+
<resource-ref>
<description>
Resource reference to JNDI factory for the JDBCUserDatabase.
@@ -251,7 +251,7 @@
Container
</res-auth>
</resource-ref>
- REMOVE ME TO ENABLE JDBC DATABASE -->
+
<!-- REMOVE ME TO ENABLE JAVAMAIL
<resource-ref>
@@ -303,7 +303,7 @@
elements.
-->
- <!-- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
+
<security-constraint>
<web-resource-collection>
@@ -314,7 +314,7 @@
<role-name>Admin</role-name>
</auth-constraint>
<user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
@@ -348,7 +348,7 @@
</auth-constraint>
<user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <transport-guarantee>NONE</transport-guarantee>
</user-data-constraint>
</security-constraint>
@@ -374,6 +374,6 @@
<role-name>Admin</role-name>
</security-role>
- REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH -->
+
</web-app>