craigmcc 02/02/27 14:43:56
Modified: catalina/src/share/org/apache/catalina/servlets
LocalStrings.properties LocalStrings_ja.properties
ManagerServlet.java
Log:
Add the "docBase" property to the information displayed by the /list command,
to assist tools in remembering the connection between a context path and the
application that is deployed on that path.
Revision Changes Path
1.13 +1 -1
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalStrings.properties 27 Feb 2002 05:40:57 -0000 1.12
+++ LocalStrings.properties 27 Feb 2002 22:43:56 -0000 1.13
@@ -18,7 +18,7 @@
managerServlet.invalidPath=FAIL - Invalid context path {0} was specified
managerServlet.invalidWar=FAIL - Invalid application URL {0} was specified
managerServlet.listed=OK - Listed applications for virtual host {0}
-managerServlet.listitem={0}:{1}:{2}
+managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.noAppBase=FAIL - Cannot identify application base for context path
{0}
managerServlet.noCommand=FAIL - No command was specified
managerServlet.noContext=FAIL - No context exists for path {0}
1.4 +1 -1
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties
Index: LocalStrings_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/LocalStrings_ja.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings_ja.properties 3 Nov 2001 03:58:51 -0000 1.3
+++ LocalStrings_ja.properties 27 Feb 2002 22:43:56 -0000 1.4
@@ -15,7 +15,7 @@
managerServlet.invalidPath=\u5931\u6557 -
\u7121\u52b9\u306a\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9 {0}
\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
managerServlet.invalidWar=\u5931\u6557 -
\u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u306eURL {0}
\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f
managerServlet.listed=OK - \u30d0\u30fc\u30c1\u30e3\u30eb\u30db\u30b9\u30c8 {0}
\u306e\u30ea\u30b9\u30c8\u3055\u308c\u305f\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3
-managerServlet.listitem={0}:{1}:{2}
+managerServlet.listitem={0}:{1}:{2}:{3}
managerServlet.noCommand=\u5931\u6557 -
\u30b3\u30de\u30f3\u30c9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
managerServlet.noContext=\u5931\u6557 - \u30d1\u30b9 {0}
\u306e\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u304c\u5b58\u5728\u3057\u307e\u305b\u3093
managerServlet.noPath=\u5931\u6557 -
\u30b3\u30f3\u30c6\u30ad\u30b9\u30c8\u30d1\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
1.14 +8 -6
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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ManagerServlet.java 27 Feb 2002 05:40:57 -0000 1.13
+++ ManagerServlet.java 27 Feb 2002 22:43:56 -0000 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.13 2002/02/27 05:40:57 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2002/02/27 05:40:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
1.14 2002/02/27 22:43:56 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/02/27 22:43:56 $
*
* ====================================================================
*
@@ -182,7 +182,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.13 $ $Date: 2002/02/27 05:40:57 $
+ * @version $Revision: 1.14 $ $Date: 2002/02/27 22:43:56 $
*/
public class ManagerServlet
@@ -708,12 +708,14 @@
writer.println(sm.getString("managerServlet.listitem",
displayPath,
"running",
- "" +
context.getManager().findSessions().length));
+ "" +
context.getManager().findSessions().length,
+ context.getDocBase()));
} else {
writer.println(sm.getString("managerServlet.listitem",
displayPath,
"stopped",
- "0"));
+ "0",
+ context.getDocBase()));
}
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
