On 13/04/2016 10:26, Violeta Georgieva wrote: > Hi Mark, > > 2016-04-12 21:58 GMT+03:00 <ma...@apache.org>: >> >> Author: markt >> Date: Tue Apr 12 18:58:24 2016 >> New Revision: 1738850 >> >> URL: http://svn.apache.org/viewvc?rev=1738850&view=rev >> Log: >> Correctly configure the base path for a resources directory provided by > an expanded JAR file. >> Patch provided by hengyunabc. >> This closes #31 > > With this change a META-INF/resources folder placed in WEB-INF/classes will > also be able to supply static resources. > Currently GUMP is failing because of this.
Thanks for the heads up. I'll take another look at this. Mark > > Regards, > Violeta > >> Modified: >> tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java >> tomcat/trunk/webapps/docs/changelog.xml >> >> Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java >> URL: > http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1738850&r1=1738849&r2=1738850&view=diff >> > ============================================================================== >> --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java > (original) >> +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue > Apr 12 18:58:24 2016 >> @@ -1693,7 +1693,7 @@ public class ContextConfig implements Li >> if (resources.isDirectory()) { >> context.getResources().createWebResourceSet( >> > WebResourceRoot.ResourceSetType.RESOURCE_JAR, >> - "/", file.getAbsolutePath(), null, "/"); >> + "/", resources.getAbsolutePath(), null, > "/"); >> } >> } >> } catch (IOException ioe) { >> >> Modified: tomcat/trunk/webapps/docs/changelog.xml >> URL: > http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1738850&r1=1738849&r2=1738850&view=diff >> > ============================================================================== >> --- tomcat/trunk/webapps/docs/changelog.xml (original) >> +++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 12 18:58:24 2016 >> @@ -124,6 +124,10 @@ >> mapping type information for the current request to reflect > discussions >> within the EG. (markt) >> </update> >> + <fix> >> + Correctly configure the base path for a resources directory > provided by >> + an expanded JAR file. Patch provided by hengyunabc. (markt) >> + </fix> >> </changelog> >> </subsection> >> <subsection name="Coyote"> >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
