Author: jfclere
Date: Tue Aug 16 11:59:26 2011
New Revision: 1158216
URL: http://svn.apache.org/viewvc?rev=1158216&view=rev
Log:
Add the searchVirtualFirst flag logic.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1158216&r1=1158215&r2=1158216&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Aug 16 11:59:26 2011
@@ -45,19 +45,6 @@ PATCHES PROPOSED TO BACKPORT:
and fix it later if needed? I think that actually nobody besides the
release manager
uses this, so I am letting this pass.
-* Expose the new WebappLoader flag in the VirtualWebappLoader,
- but allow alternative name searchVirtualFirst to make it
- consistent with the "virtual" terminology.
- Now you can decide, whether the virtual paths will
- be searched before the webapp or after it.
- If searched before, external resources take precendence
- over internal ones. Before that change one couldn't overwrite
- resources already present in the webapp.
- http://svn.apache.org/viewvc?view=revision&revision=936825
-
http://people.apache.org/~rjung/patches/2010-05-14-loader-backport-r936825.patch
- +1: rjung, funkman, kkolinko
- -1:
-
* Backport JSP unloading patch (BZ48358).
The patch has substantially changed since the original version.
Original revisions are: 937787, 1028377, 1028389, 1028396, 1028861, 1028862,
1028863,
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=1158216&r1=1158215&r2=1158216&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
Tue Aug 16 11:59:26 2011
@@ -91,6 +91,20 @@ public class VirtualWebappLoader extends
virtualClasspath = path;
}
+ /**
+ * @return Returns searchVirtualFirst.
+ */
+ public boolean getSearchVirtualFirst() {
+ return getSearchExternalFirst();
+ }
+
+ /**
+ * @param searchVirtualFirst Whether the virtual class path should be
searched before the webapp
+ */
+ public void setSearchVirtualFirst(boolean searchVirtualFirst) {
+ setSearchExternalFirst(searchVirtualFirst);
+ }
+
@Override
public void start() throws LifecycleException {
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=1158216&r1=1158215&r2=1158216&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
Tue Aug 16 11:59:26 2011
@@ -85,6 +85,10 @@
description="The reloadable flag for this Loader"
type="boolean"/>
+ <attribute name="searchVirtualFirst"
+ description="The searchVirtualFirst flag for this Loader"
+ type="boolean"/>
+
<attribute name="repositories"
description="Extra repositories managed by this loader"
type="[Ljava.lang.String;"/>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1158216&r1=1158215&r2=1158216&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Aug 16 11:59:26 2011
@@ -46,6 +46,9 @@
<section name="Tomcat 6.0.33 (jfclere)">
<subsection name="Catalina">
<changelog>
+ <add>
+ Allow to search the virtual paths before the webapp or after it.
(rjung)
+ </add>
<fix>
<bug>27988</bug>: Improve reporting of missing files. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
