git.internetallee.de Git - tomcat7.0/commit

projects / tomcat7.0 / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 0c8d31d) | patch

author	pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
	Fri, 30 Apr 2010 11:23:41 +0000 (11:23 +0000)
committer	pero <pero@13f79535-47bb-0310-9956-ffa450edef68>
	Fri, 30 Apr 2010 11:23:41 +0000 (11:23 +0000)
commit	4248ff083ca3cb14bc6dcebe1f9dcd03f5cefb0f
tree	eb92c599eb0575418da513a727949673148642a3	tree \| snapshot
parent	0c8d31d85e0253420b39add275fce3b6d1591a93	commit \| diff

web.xml or fragment must merge with annotations s. Servlet Spec 3.0 8.2.3

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@939638 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/startup/ContextConfig.java		diff \| blob \| history
test/org/apache/catalina/startup/DuplicateMappingParamFilter.java	[new file with mode: 0644]	blob
test/org/apache/catalina/startup/DuplicateMappingParamServlet.java		diff \| blob \| history
test/org/apache/catalina/startup/ParamFilter.java	[new file with mode: 0644]	blob
test/org/apache/catalina/startup/TestContextConfigAnnotation.java		diff \| blob \| history

Unnamed repository; edit this file to name it for gitweb.