[jbossweb-commits] JBossWeb SVN: r1023 - trunk/java/org/apache/catalina/startup.
Author: remy.maucherat(a)jboss.com
Date: 2009-04-22 10:31:47 -0400 (Wed, 22 Apr 2009)
New Revision: 1023
Modified:
trunk/java/org/apache/catalina/startup/ContextConfig.java
Log:
- Fix order.
Modified: trunk/java/org/apache/catalina/startup/ContextConfig.java
===================================================================
--- trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-04-21 18:15:22 UTC (rev
1022)
+++ trunk/java/org/apache/catalina/startup/ContextConfig.java 2009-04-22 14:31:47 UTC (rev
1023)
@@ -1265,10 +1265,10 @@
// Process the default and application web.xml files
defaultWebConfig();
- applicationWebConfig();
scanner.scan(context);
// FIXME: look where to place it according to the merging rules
applicationExtraDescriptorsConfig();
+ applicationWebConfig();
if (!context.getIgnoreAnnotations()) {
applicationAnnotationsConfig();
}