Author: markt
Date: Mon Oct 17 14:44:15 2011
New Revision: 1185220
URL: http://svn.apache.org/viewvc?rev=1185220&view=rev
Log:
Re-factor merge code so it does not modify fragments to support caching of
default web.xml settings
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 17 14:44:15 2011
@@ -1 +1 @@
-/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183328,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200
+/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256
,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178721,1180261,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183328,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1185220&r1=1185219&r2=1185220&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Mon Oct 17
14:44:15 2011
@@ -19,6 +19,7 @@
package org.apache.catalina.deploy;
import java.net.URL;
+import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -1453,21 +1454,17 @@ public class WebXml {
// As per 'clarification' from the Servlet EG, filter definitions in
the
// main web.xml override those in fragments and those in fragments
// override those in annotations
+ List<FilterMap> filterMapsToAdd = new ArrayList<FilterMap>();
for (WebXml fragment : fragments) {
- Iterator<FilterMap> iterFilterMaps =
- fragment.getFilterMappings().iterator();
- while (iterFilterMaps.hasNext()) {
- FilterMap filterMap = iterFilterMaps.next();
- if (filterMappingNames.contains(filterMap.getFilterName())) {
- iterFilterMaps.remove();
+ for (FilterMap filterMap : fragment.getFilterMappings()) {
+ if (!filterMappingNames.contains(filterMap.getFilterName())) {
+ filterMapsToAdd.add(filterMap);
}
}
}
- for (WebXml fragment : fragments) {
- for (FilterMap filterMap : fragment.getFilterMappings()) {
- // Additive
- addFilterMapping(filterMap);
- }
+ for (FilterMap filterMap : filterMapsToAdd) {
+ // Additive
+ addFilterMapping(filterMap);
}
for (WebXml fragment : fragments) {
@@ -1609,28 +1606,23 @@ public class WebXml {
// As per 'clarification' from the Servlet EG, servlet definitions and
// mappings in the main web.xml override those in fragments and those
in
// fragments override those in annotations
- // Remove servlet definitions and mappings from fragments that are
+ // Skip servlet definitions and mappings from fragments that are
// defined in web.xml
+ List<Map.Entry<String,String>> servletMappingsToAdd =
+ new ArrayList<Map.Entry<String,String>>();
for (WebXml fragment : fragments) {
- Iterator<Map.Entry<String,String>> iterFragmentServletMaps =
- fragment.getServletMappings().entrySet().iterator();
- while (iterFragmentServletMaps.hasNext()) {
- Map.Entry<String,String> servletMap =
- iterFragmentServletMaps.next();
- if (servletMappingNames.contains(servletMap.getValue()) ||
- servletMappings.containsKey(servletMap.getKey())) {
- iterFragmentServletMaps.remove();
+ for (Map.Entry<String,String> servletMap :
+ fragment.getServletMappings().entrySet()) {
+ if (!servletMappingNames.contains(servletMap.getValue()) &&
+ !servletMappings.containsKey(servletMap.getKey())) {
+ servletMappingsToAdd.add(servletMap);
}
}
}
// Add fragment mappings
- for (WebXml fragment : fragments) {
- for (Map.Entry<String,String> mapping :
- fragment.getServletMappings().entrySet()) {
- // Additive
- addServletMapping(mapping.getKey(), mapping.getValue());
- }
+ for (Map.Entry<String,String> mapping : servletMappingsToAdd) {
+ addServletMapping(mapping.getKey(), mapping.getValue());
}
for (WebXml fragment : fragments) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
