pero 2005/06/04 05:44:35
Modified: modules/storeconfig/src/share/org/apache/catalina/storeconfig
StandardContextSF.java
Log:
Fix that don't save WEB-INF/web.xml
Revision Changes Path
1.3 +8 -4
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java
Index: StandardContextSF.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/StandardContextSF.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StandardContextSF.java 13 Jan 2005 13:08:20 -0000 1.2
+++ StandardContextSF.java 4 Jun 2005 12:44:35 -0000 1.3
@@ -315,9 +315,10 @@
* @param wresources
* @return
* @throws IOException
- * TODO relative watchedresource TODO absolute handling
- * configFile TODO Filename case handling for Windows? TODO
- * digester variable subsitution $catalina.base,
$catalina.home
+ * TODO relative watchedresource
+ * TODO absolute handling configFile
+ * TODO Filename case handling for Windows?
+ * TODO digester variable subsitution $catalina.base, $catalina.home
*/
protected String[] filterWatchedResources(StandardContext context,
String[] wresources) throws IOException {
@@ -327,7 +328,8 @@
String confHostDefault = new File(configBase, "context.xml.default")
.getCanonicalPath();
String configFile = context.getConfigFile();
-
+ String webxml = "WEB-INF/web.xml" ;
+
List resource = new ArrayList();
for (int i = 0; i < wresources.length; i++) {
@@ -337,6 +339,8 @@
continue;
if (wresources[i].equals(configFile))
continue;
+ if (wresources[i].equals(webxml))
+ continue;
resource.add(wresources[i]);
}
return (String[]) resource.toArray(new String[resource.size()]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
