[jboss-cvs] JBossAS SVN: r102658 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 19 21:44:41 EDT 2010
Author: remy.maucherat at jboss.com
Date: 2010-03-19 21:44:41 -0400 (Fri, 19 Mar 2010)
New Revision: 102658
Modified:
trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Use a regular FileDirContext rather than a VFSDirContext (JBAS-7832) for overlays.
Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2010-03-20 01:23:26 UTC (rev 102657)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java 2010-03-20 01:44:41 UTC (rev 102658)
@@ -64,6 +64,7 @@
import org.apache.catalina.deploy.jsp.TagVariableInfo;
import org.apache.catalina.session.StandardManager;
import org.apache.catalina.startup.ContextConfig;
+import org.apache.naming.resources.FileDirContext;
import org.apache.naming.resources.ProxyDirContext;
import org.apache.tomcat.util.IntrospectionUtils;
import org.jboss.annotation.javaee.Icon;
@@ -1305,8 +1306,21 @@
ProxyDirContext resources = (ProxyDirContext) context.getResources();
for (VirtualFile overlay : overlays)
{
- VFSDirContext vfsDirContext = new VFSDirContext(overlay);
- resources.addOverlay(vfsDirContext);
+ // JBAS-7832: Replaced with FileDirContext for now
+ //VFSDirContext vfsDirContext = new VFSDirContext(overlay);
+ //resources.addOverlay(vfsDirContext);
+ FileDirContext dirContext = new FileDirContext();
+ try
+ {
+ dirContext.setDocBase(overlay.getPhysicalFile().getAbsolutePath());
+ resources.addOverlay(dirContext);
+ }
+ catch (IOException e)
+ {
+ log.error(sm.getString("contextConfig.noOverlay", context.getName()), e);
+ ok = false;
+ break;
+ }
}
}
else if (overlays.size() > 0)
More information about the jboss-cvs-commits
mailing list