cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
glenn 2003/01/24 06:48:50 Modified:webapps/manager/WEB-INF web.xml Log: Add /deploy to the security-restraint Revision ChangesPath 1.9 +1 -0 jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- web.xml 19 Jan 2003 22:25:18 - 1.8 +++ web.xml 24 Jan 2003 14:48:50 - 1.9 @@ -114,6 +114,7 @@ url-pattern/stop/url-pattern url-pattern/install/url-pattern url-pattern/remove/url-pattern + url-pattern/deploy/url-pattern url-pattern/undeploy/url-pattern url-pattern/reload/url-pattern url-pattern/serverinfo/url-pattern -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
remm2003/01/19 14:25:18 Modified:webapps/manager/WEB-INF web.xml Log: - Add back deploy command. - Submitted by Jacob Kjome hoju at visi.com Revision ChangesPath 1.8 +4 -0 jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- web.xml 10 Jan 2003 15:52:19 - 1.7 +++ web.xml 19 Jan 2003 22:25:18 - 1.8 @@ -62,6 +62,10 @@ /servlet-mapping servlet-mapping servlet-nameManager/servlet-name + url-pattern/deploy/url-pattern + /servlet-mapping + servlet-mapping +servlet-nameManager/servlet-name url-pattern/undeploy/url-pattern /servlet-mapping servlet-mapping -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
remm2002/06/13 10:38:01 Modified:webapps/manager/WEB-INF web.xml Log: - Map the HTML manager to /html/*. I couldn't find any problems this would create. Revision ChangesPath 1.6 +18 -0 jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- web.xml 8 Apr 2002 17:46:08 - 1.5 +++ web.xml 13 Jun 2002 17:38:01 - 1.6 @@ -6,6 +6,12 @@ web-app + display-nameTomcat Manager Application/display-name + description +A scriptable management web application for the Tomcat Web Server; + Manager lets you view, load/unload/etc particular web applications. + /description + !-- Define the Manager Servlet Change servlet-class to: org.apache.catalina.servlets.HTMLManagerServlet to get a Servlet with a more intuitive HTML interface, don't change if you @@ -20,11 +26,23 @@ param-value2/param-value /init-param /servlet + servlet +servlet-nameHTMLManager/servlet-name +servlet-classorg.apache.catalina.servlets.HTMLManagerServlet/servlet-class +init-param + param-namedebug/param-name + param-value2/param-value +/init-param + /servlet !-- Define the Manager Servlet Mapping -- servlet-mapping servlet-nameManager/servlet-name url-pattern/*/url-pattern + /servlet-mapping + servlet-mapping +servlet-nameHTMLManager/servlet-name +url-pattern/html/*/url-pattern /servlet-mapping !-- Define reference to the user database for looking up roles -- -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
craigmcc02/04/08 10:46:08
Modified:catalina/src/share/org/apache/catalina/servlets
LocalStrings.properties ManagerServlet.java
webapps/manager manager.xml
webapps/manager/WEB-INF web.xml
Log:
Implement a lookup mechanism to enumerate the security roles (and corresponding
descriptions) defined in the user database. This will be useful, for example,
in deployment tools that wish to create security-role-ref elements in the
web.xml file that link role names used in the web application to those that are
actually defined in the container.
Revision ChangesPath
1.15 +3 -0
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- LocalStrings.properties 12 Mar 2002 21:14:15 - 1.14
+++ LocalStrings.properties 8 Apr 2002 17:46:08 - 1.15
@@ -34,6 +34,7 @@
managerServlet.removed=OK - Removed application at context path {0}
managerServlet.resourcesAll=OK - Listed global resources of all types
managerServlet.resourcesType=OK - Listed global resources of type {0}
+managerServlet.rolesList=OK - Listed security roles
managerServlet.sessiondefaultmax=Default maximum session inactive interval {0}
minutes
managerServlet.sessiontimeout={0} minutes:{1} sessions
managerServlet.sessions=OK - Session information for application at context path {0}
@@ -42,6 +43,8 @@
managerServlet.stopped=OK - Stopped application at context path {0}
managerServlet.undeployed=OK - Undeployed application at context path {0}
managerServlet.unknownCommand=FAIL - Unknown command {0}
+managerServlet.userDatabaseError=FAIL - Cannot resolve user database reference
+managerServlet.userDatabaseMissing=FAIL - No user database is available
webdavservlet.jaxpfailed=JAXP initialization failed
directory.filename=Filename
directory.lastModified=Last Modified
1.19 +63 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
Index: ManagerServlet.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ManagerServlet.java 13 Mar 2002 01:26:49 - 1.18
+++ ManagerServlet.java 8 Apr 2002 17:46:08 - 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.18 2002/03/13 01:26:49 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2002/03/13 01:26:49 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.19 2002/04/08 17:46:08 craigmcc Exp $
+ * $Revision: 1.19 $
+ * $Date: 2002/04/08 17:46:08 $
*
*
*
@@ -73,8 +73,11 @@
import java.io.PrintWriter;
import java.net.URL;
import java.util.Enumeration;
+import java.util.Iterator;
+import javax.naming.InitialContext;
import javax.naming.NameClassPair;
import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.directory.DirContext;
import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
@@ -88,9 +91,11 @@
import org.apache.catalina.Deployer;
import org.apache.catalina.Globals;
import org.apache.catalina.Host;
+import org.apache.catalina.Role;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Session;
+import org.apache.catalina.UserDatabase;
import org.apache.catalina.Wrapper;
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.util.StringManager;
@@ -137,6 +142,9 @@
* lib/resources?type=/b - Enumerate the available global JNDI
* resources, optionally limited to those of the specified type
* (fully qualified Java class name), if available./li
+ * lib/roles/b - Enumerate the available security role names and
+ * descriptions from the user database connected to the codeusers/code
+ * resource reference.
* lib/sessions?path=/xxx/b - List session information about the web
* application attached to context path code/xxx/code for this
* virtual host./li
@@ -188,7 +196,7 @@
* /ul
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2002/03/13 01:26:49 $
+ * @version $Revision: 1.19 $ $Date: 2002/04/08
cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
craigmcc02/04/04 12:30:34
Modified:catalina/src/share/org/apache/catalina/core
StandardContext.java
catalina/src/share/org/apache/catalina/startup
ContextConfig.java LocalStrings.properties
webapps/admin/WEB-INF web.xml
webapps/examples/WEB-INF web.xml
webapps/manager/WEB-INF web.xml
Log:
When parsing web.xml files, log warnings if a security role name is used
in a run-as, security-role-ref, or auth-constraint element without
also being defined in a security-role element. For backwards compatibility
these are not considered fatal, although it is likely that they will be fatal
in Servlet 2.4.
Modify the web.xml files for packaged applications (admin, examples, and
manager) so that they properly define the security roles that they use.
Revision ChangesPath
1.103 +5 -5
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.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- StandardContext.java 14 Mar 2002 21:41:35 - 1.102
+++ StandardContext.java 4 Apr 2002 20:30:34 - 1.103
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.102 2002/03/14 21:41:35 remm Exp $
- * $Revision: 1.102 $
- * $Date: 2002/03/14 21:41:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.103 2002/04/04 20:30:34 craigmcc Exp $
+ * $Revision: 1.103 $
+ * $Date: 2002/04/04 20:30:34 $
*
*
*
@@ -147,7 +147,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.102 $ $Date: 2002/03/14 21:41:35 $
+ * @version $Revision: 1.103 $ $Date: 2002/04/04 20:30:34 $
*/
public class StandardContext
@@ -1606,7 +1606,7 @@
String results[] =new String[securityRoles.length + 1];
for (int i = 0; i securityRoles.length; i++)
results[i] = securityRoles[i];
-results[securityRoles.length] = name;
+results[securityRoles.length] = role;
securityRoles = results;
}
fireContainerEvent(addSecurityRole, role);
1.61 +51 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Index: ContextConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ContextConfig.java14 Mar 2002 23:58:35 - 1.60
+++ ContextConfig.java4 Apr 2002 20:30:34 - 1.61
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.60 2002/03/14 23:58:35 craigmcc Exp $
- * $Revision: 1.60 $
- * $Date: 2002/03/14 23:58:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.61 2002/04/04 20:30:34 craigmcc Exp $
+ * $Revision: 1.61 $
+ * $Date: 2002/04/04 20:30:34 $
*
*
*
@@ -131,7 +131,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.60 $ $Date: 2002/03/14 23:58:35 $
+ * @version $Revision: 1.61 $ $Date: 2002/04/04 20:30:34 $
*/
public final class ContextConfig
@@ -593,6 +593,9 @@
// Process the default and application web.xml files
defaultConfig();
applicationConfig();
+if (ok) {
+validateSecurityRoles();
+}
// Scan tag library descriptor files for additional listener classes
if (ok) {
@@ -1049,6 +1052,50 @@
// Return the completed set
return (resourcePaths);
+
+}
+
+
+/**
+ * Validate the usage of security role names in the web application
+ * deployment descriptor. If any problems are found, issue warning
+ * messages (for backwards compatibility) and add the missing roles.
+ * (To make these problems fatal instead, simply set the codeok/code
+ * instance variable to codefalse/code as well).
+ */
+private void validateSecurityRoles() {
+
+// Check role names used in security-constraint elements
+
cvs commit: jakarta-tomcat-4.0/webapps/manager/WEB-INF web.xml
bip 01/05/27 14:13:40 Modified:webapps/manager/WEB-INF web.xml Log: Added a comment about HTMLManagerServlet Revision ChangesPath 1.2 +6 -1 jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml Index: web.xml === RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/manager/WEB-INF/web.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- web.xml 2000/10/05 02:30:23 1.1 +++ web.xml 2001/05/27 21:13:40 1.2 @@ -6,7 +6,12 @@ web-app - !-- Define the Manager Servlet -- + !-- Define the Manager Servlet + Change servlet-class to: org.apache.catalina.servlets.HTMLManagerServlet + to get a Servlet with a more intuitive HTML interface, don't change if you + have software that is expected to parse the output from ManagerServlet + since they're not compatible. + -- servlet servlet-nameManager/servlet-name servlet-classorg.apache.catalina.servlets.ManagerServlet/servlet-class
