craigmcc 01/10/27 13:53:39
Modified: catalina/src/conf server.xml
webapps build.xml
Log:
Migrate the actual files of the Manager application to
$CATALINA_HOME/server/webapps, parallel with the Admin application. This
is in no way required to be a privileged app, but makes the creation of
security manager policies easier (things under "server" are trusted,
things under "webapps" are not).
Revision Changes Path
1.43 +0 -4 jakarta-tomcat-4.0/catalina/src/conf/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- server.xml 2001/10/26 22:53:40 1.42
+++ server.xml 2001/10/27 20:53:39 1.43
@@ -209,10 +209,6 @@
<Context path="" docBase="ROOT" debug="0"/>
-->
- <!-- Tomcat Manager Context -->
- <Context path="/manager" docBase="manager"
- debug="0" privileged="true"/>
-
<!-- Tomcat Examples Context -->
<Context path="/examples" docBase="examples" debug="0"
reloadable="true" crossContext="true">
1.20 +7 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 2001/10/25 16:36:05 1.19
+++ build.xml 2001/10/27 20:53:39 1.20
@@ -76,7 +76,7 @@
<!-- General Purpose Applications -->
<mkdir dir="${webapps.deploy}/webapps"/>
<copy todir="${webapps.deploy}/webapps">
- <fileset dir="${webapps.build}" excludes="admin/**"/>
+ <fileset dir="${webapps.build}" excludes="admin/**,manager/**"/>
</copy>
<!-- Administrative Applications -->
@@ -84,6 +84,12 @@
<mkdir dir="${webapps.deploy}/server/webapps/admin"/>
<copy todir="${webapps.deploy}/server/webapps/admin">
<fileset dir="${webapps.build}/admin" excludes="admin.xml"/>
+ </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"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
