craigmcc 01/10/27 14:20:03
Modified: catalina build.xml
catalina/src/share/org/apache/catalina/core
StandardContext.java
webapps build.xml
Log:
Experimental patch that makes the parent class loader for privileged
webapps be the Catalina class loader, rather than the Shared class loader.
This facilitates writing administrative applications that need access to
Catalina internals, without requiring the entire administrative app to be
included in the Catalina class loader.
Revision Changes Path
1.83 +2 -2 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- build.xml 2001/10/27 20:19:06 1.82
+++ build.xml 2001/10/27 21:20:03 1.83
@@ -466,10 +466,10 @@
<copy todir="${catalina.build}/common/lib" file="${jdbc20ext.jar}"/>
</target>
<target name="copy-jmxri.jar" if="copy.jmxri.jar">
- <copy todir="${catalina.build}/common/lib" file="${jmxri.jar}"/>
+ <copy todir="${catalina.build}/server/lib" file="${jmxri.jar}"/>
</target>
<target name="copy-jmxtools.jar" if="copy.jmxtools.jar">
- <copy todir="${catalina.build}/common/lib" file="${jmxtools.jar}"/>
+ <copy todir="${catalina.build}/server/lib" file="${jmxtools.jar}"/>
</target>
<target name="copy-jndi.jar" if="copy.jndi.jar">
<copy todir="${catalina.build}/common/lib" file="${jndi.jar}"/>
1.85 +13 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
Index: StandardContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- StandardContext.java 2001/10/26 17:17:08 1.84
+++ StandardContext.java 2001/10/27 21:20:03 1.85
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.84 2001/10/26 17:17:08 remm Exp $
- * $Revision: 1.84 $
- * $Date: 2001/10/26 17:17:08 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.85 2001/10/27 21:20:03 craigmcc Exp $
+ * $Revision: 1.85 $
+ * $Date: 2001/10/27 21:20:03 $
*
* ====================================================================
*
@@ -142,7 +142,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.84 $ $Date: 2001/10/26 17:17:08 $
+ * @version $Revision: 1.85 $ $Date: 2001/10/27 21:20:03 $
*/
public class StandardContext
@@ -3308,9 +3308,15 @@
}
}
if (getLoader() == null) { // (2) Required by Manager
- if (debug >= 1)
- log("Configuring default Loader");
- setLoader(new WebappLoader(getParentClassLoader()));
+ if (getPrivileged()) {
+ if (debug >= 1)
+ log("Configuring privileged default Loader");
+ setLoader(new WebappLoader(this.getClass().getClassLoader()));
+ } else {
+ if (debug >= 1)
+ log("Configuring non-privileged default Loader");
+ setLoader(new WebappLoader(getParentClassLoader()));
+ }
}
if (getManager() == null) { // (3) After prerequisites
if (debug >= 1)
1.21 +13 -2 jakarta-tomcat-4.0/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 2001/10/27 20:53:39 1.20
+++ build.xml 2001/10/27 21:20:03 1.21
@@ -81,18 +81,29 @@
<!-- Administrative Applications -->
<mkdir dir="${webapps.deploy}/server/webapps"/>
+
+ <copy todir="${webapps.deploy}/webapps"
+ file="${webapps.build}/admin/admin.xml"/>
<mkdir dir="${webapps.deploy}/server/webapps/admin"/>
<copy todir="${webapps.deploy}/server/webapps/admin">
<fileset dir="${webapps.build}/admin" excludes="admin.xml"/>
</copy>
+ <mkdir dir="${webapps.deploy}/server/webapps/admin/WEB-INF/lib"/>
+ <copy todir="${webapps.deploy}/server/webapps/admin/WEB-INF/lib">
+ <fileset dir="${webapps.deploy}/shared/lib" includes="jasper-*.jar"/>
+ </copy>
+
<copy todir="${webapps.deploy}/webapps"
file="${webapps.build}/manager/manager.xml"/>
<mkdir dir="${webapps.deploy}/server/webapps/manager"/>
<copy todir="${webapps.deploy}/server/webapps/manager">
<fileset dir="${webapps.build}/manager" excludes="manager.xml"/>
</copy>
- <copy todir="${webapps.deploy}/webapps"
- file="${webapps.build}/admin/admin.xml"/>
+ <mkdir dir="${webapps.deploy}/server/webapps/manager/WEB-INF/lib"/>
+ <copy todir="${webapps.deploy}/server/webapps/manager/WEB-INF/lib">
+ <fileset dir="${webapps.deploy}/shared/lib" includes="jasper-*.jar"/>
+ </copy>
+
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
