tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1133201 - in /tomcat/trunk: java/org/apache/catalina/startup/ContextConfig.java webapps/docs/changelog.xml
Date Tue, 07 Jun 2011 23:48:17 GMT
Author: markt
Date: Tue Jun  7 23:48:17 2011
New Revision: 1133201

URL: http://svn.apache.org/viewvc?rev=1133201&view=rev
Log:
Correct a regression in the fix for bug 51278 that prevented any web application from being
marked as distributable. (kfujino)

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=1133201&r1=1133200&r2=1133201&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Jun  7 23:48:17 2011
@@ -1195,6 +1195,10 @@ public class ContextConfig
          */ 
         WebXml webXmlDefaultFragment = createWebXml();
         webXmlDefaultFragment.setOverridable(true);
+        // Set to distributable else every app will be prevented from being
+        // distributable when the default fragment is merged with the main
+        // web.xml
+        webXmlDefaultFragment.setDistributable(true);
 
         // Parse global web.xml if present
         InputSource globalWebXml = getGlobalWebXmlSource();

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1133201&r1=1133200&r2=1133201&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun  7 23:48:17 2011
@@ -55,6 +55,10 @@
         response buffer to ensure that the doFlush flag does not get stuck in
         the enabled state. Patch provided by Jeremy Norris. (markt)
       </fix>
+      <fix>
+        Correct a regression in the fix for <bug>51278</bug> that prevented any
+        web application from being marked as distributable. (kfujino/mark)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



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


Mime
View raw message