Author: markt
Date: Sun Mar 17 14:26:53 2013
New Revision: 1457454
URL: http://svn.apache.org/r1457454
Log:
Change the name of the working directory for the ROOT application (located
under $CATALINA_BASE/work by default) from _ to ROOT.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/util/ContextName.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1457454&r1=1457453&r2=1457454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Sun Mar 17
14:26:53 2013
@@ -6047,7 +6047,7 @@ public class StandardContext extends Con
temp = temp.replace('/', '_');
temp = temp.replace('\\', '_');
if (temp.length() < 1)
- temp = "_";
+ temp = ContextName.ROOT_NAME;
if (hostWorkDir != null ) {
workDir = hostWorkDir + File.separator + temp;
} else {
Modified: tomcat/trunk/java/org/apache/catalina/util/ContextName.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ContextName.java?rev=1457454&r1=1457453&r2=1457454&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ContextName.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ContextName.java Sun Mar 17
14:26:53 2013
@@ -23,7 +23,7 @@ import java.util.Locale;
* conversions between baseName, path and version take place.
*/
public final class ContextName {
- private static final String ROOT_NAME = "ROOT";
+ public static final String ROOT_NAME = "ROOT";
private static final String VERSION_MARKER = "##";
private static final String FWD_SLASH_REPLACEMENT = "#";
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1457454&r1=1457453&r2=1457454&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 17 14:26:53 2013
@@ -118,6 +118,11 @@
<code>HttpServletRequest#changeSessionId()</code>. Patch provided by
Nick Williams. (markt)
</add>
+ <fix>
+ <bug>54708</bug>: Change the name of the working directory for the ROOT
+ application (located under $CATALINA_BASE/work by default) from _ to
+ ROOT. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
