tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Dominik Drzewiecki" <drz...@post.pl>
Subject Re: cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
Date Tue, 14 Dec 2004 14:44:15 GMT
See, I told you that there was a bug, that prevented antiResourceLocking 
from working :P
On Windows, Tomcat 5.5.6 Installer leaves service's Working Path blank on 
both startup and shutdown tabs.
Filling it with apropriate value solves the problem for 5.5.6.

Now, there is still this antiJARLocking left

> remm        2004/12/14 05:57:31
> 
>   Modified:    catalina/src/share/org/apache/catalina/startup
>                         ContextConfig.java
>                webapps/docs changelog.xml
>   Log:
>   - 32694: Fix bad code to make a path absolute, which caused problem if 
> the VM working path is not catalina.base.
> 
>   Revision  Changes    Path
>   1.60      +6 -2      
> jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Co
> ntextConfig.java
> 
>   Index: ContextConfig.java
>   ===================================================================
>   RCS file: 
> /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/
> startup/ContextConfig.java,v
>   retrieving revision 1.59
>   retrieving revision 1.60
>   diff -u -r1.59 -r1.60
>   --- ContextConfig.java	2 Oct 2004 09:22:18 -0000	1.59
>   +++ ContextConfig.java	14 Dec 2004 13:57:31 -0000	1.60
>   @@ -843,7 +843,11 @@
>                }
>                File docBaseFile = new File(docBase);
>                if (!docBaseFile.isAbsolute()) {
>   -                docBaseFile = new File(appBase, docBase);
>   +                File file = new File(appBase);
>   +                if (!file.isAbsolute()) {
>   +                    file = new 
> File(System.getProperty("catalina.base"), appBase);
>   +                }
>   +                docBaseFile = new File(file, docBase);
>                }
> 
>                String path = context.getPath();
> 
>   1.205     +11 -0     jakarta-tomcat-catalina/webapps/docs/changelog.xml
> 
> 
>   Index: changelog.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,
> v
>   retrieving revision 1.204
>   retrieving revision 1.205
>   diff -u -r1.204 -r1.205
>   --- changelog.xml	11 Dec 2004 08:06:20 -0000	1.204
>   +++ changelog.xml	14 Dec 2004 13:57:31 -0000	1.205
>   @@ -26,6 +26,17 @@
>      </p>
>    </section>
> 
>   +<section name="Tomcat 5.5.7 (yoavs)">
>   +  <subsection name="Catalina">
>   +    <changelog>
>   +      <fix>
>   +        <bug>32694</bug>: Fix bad code to make docBase path aboslute 
> in antiLocking
>   +        method. (remm)
>   +      </fix>
>   +    </changelog>
>   +  </subsection>
>   +</section>
>   +
>    <section name="Tomcat 5.5.6 (yoavs)">
>      <subsection name="General">
>        <changelog>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org




---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message