Author: markt
Date: Fri Mar 4 11:23:43 2011
New Revision: 1077883
URL: http://svn.apache.org/viewvc?rev=1077883&view=rev
Log:
Check metadata-complete=true leads to @ServletSecurity being ignored
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1077883&r1=1077882&r2=1077883&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Fri Mar
4 11:23:43 2011
@@ -92,6 +92,26 @@ public class TestStandardWrapper extends
assertEquals(403, rc);
}
+ public void testSecurityAnnotationsMetaDataPriority() throws Exception {
+
+ // Setup Tomcat instance
+ Tomcat tomcat = getTomcatInstance();
+
+ File appDir = new File("test/webapp-3.0");
+ tomcat.addWebapp(null, "", appDir.getAbsolutePath());
+
+ tomcat.start();
+
+ ByteChunk bc = new ByteChunk();
+ int rc;
+ rc = getUrl("http://localhost:"; + getPort() +
+ "/testStandardWrapper/securityAnnotationsMetaDataPriority",
+ bc, null, null);
+
+ assertEquals("OK", bc.toString());
+ assertEquals(200, rc);
+ }
+
private void doTest(String servletClassName, boolean usePost,
boolean useRole, boolean expect200) throws Exception {
Modified: tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml?rev=1077883&r1=1077882&r2=1077883&view=diff
==============================================================================
--- tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml (original)
+++ tomcat/trunk/test/webapp-3.0/WEB-INF/web.xml Fri Mar 4 11:23:43 2011
@@ -103,4 +103,14 @@
<url-pattern>/bug49nnn/bug49726b.jsp</url-pattern>
</jsp-property-group>
</jsp-config>
+
+ <servlet>
+ <servlet-name>DenyByAnnotation</servlet-name>
+
<servlet-class>org.apache.catalina.core.TestStandardWrapper$DenyAllServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>DenyByAnnotation</servlet-name>
+
<url-pattern>/testStandardWrapper/securityAnnotationsMetaDataPriority</url-pattern>
+ </servlet-mapping>
+
</web-app>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
