|
@@ -2852,7 +2852,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|
// xi:include are treated as inline and retain current source
|
|
// xi:include are treated as inline and retain current source
|
|
URL include = getResource(confInclude);
|
|
URL include = getResource(confInclude);
|
|
if (include != null) {
|
|
if (include != null) {
|
|
- Resource classpathResource = new Resource(include, name);
|
|
|
|
|
|
+ Resource classpathResource = new Resource(include, name,
|
|
|
|
+ wrapper.isParserRestricted());
|
|
loadResource(properties, classpathResource, quiet);
|
|
loadResource(properties, classpathResource, quiet);
|
|
} else {
|
|
} else {
|
|
URL url;
|
|
URL url;
|
|
@@ -2873,7 +2874,8 @@ public class Configuration implements Iterable<Map.Entry<String,String>>,
|
|
}
|
|
}
|
|
url = href.toURI().toURL();
|
|
url = href.toURI().toURL();
|
|
}
|
|
}
|
|
- Resource uriResource = new Resource(url, name);
|
|
|
|
|
|
+ Resource uriResource = new Resource(url, name,
|
|
|
|
+ wrapper.isParserRestricted());
|
|
loadResource(properties, uriResource, quiet);
|
|
loadResource(properties, uriResource, quiet);
|
|
}
|
|
}
|
|
break;
|
|
break;
|