cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java ManagerServlet.java

2005-01-04 Thread markt 
markt   2005/01/04 17:03:23

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java ManagerServlet.java
  Log:
  Fix trivial (since it is within the manager web app that should not be
  publically accessible) XSS issue.
  
  Revision  ChangesPath
  1.18  +4 -2  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- HTMLManagerServlet.java   14 Oct 2004 17:25:32 -  1.17
  +++ HTMLManagerServlet.java   5 Jan 2005 01:03:22 -   1.18
  @@ -32,6 +32,7 @@
   
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  +import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.ServerInfo;
   import org.apache.commons.fileupload.FileItem;
   import org.apache.commons.fileupload.DiskFileUpload;
  @@ -105,7 +106,8 @@
   message = stop(path);
   } else {
   message =
  -sm.getString("managerServlet.unknownCommand", command);
  +sm.getString("managerServlet.unknownCommand",
  + RequestUtil.filter(command));
   }
   
   list(request, response, message);
  
  
  
  1.27  +20 -12
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ManagerServlet.java   3 Jan 2005 16:09:26 -   1.26
  +++ ManagerServlet.java   5 Jan 2005 01:03:22 -   1.27
  @@ -52,6 +52,7 @@
   import org.apache.catalina.UserDatabase;
   import org.apache.catalina.Wrapper;
   import org.apache.catalina.core.StandardServer;
  +import org.apache.catalina.util.RequestUtil;
   import org.apache.catalina.util.ServerInfo;
   import org.apache.catalina.util.StringManager;
   import org.apache.commons.modeler.Registry;
  @@ -762,7 +763,7 @@
   
   if (path == null || path.length() == 0 || !path.startsWith("/")) {
   writer.println(sm.getString("managerServlet.invalidPath",
  -path));
  +RequestUtil.filter(path)));
   return;
   }
   String displayPath = path;
  @@ -881,7 +882,8 @@
   log("restart: Reloading web application at '" + path + "'");
   
   if ((path == null) || (!path.startsWith("/") && path.equals(""))) {
  -writer.println(sm.getString("managerServlet.invalidPath", path));
  +writer.println(sm.getString("managerServlet.invalidPath",
  +RequestUtil.filter(path)));
   return;
   }
   String displayPath = path;
  @@ -892,7 +894,8 @@
   Context context = (Context) host.findChild(path);
   if (context == null) {
   writer.println(sm.getString
  -   ("managerServlet.noContext", displayPath));
  +   ("managerServlet.noContext",
  +   RequestUtil.filter(displayPath)));
   return;
   }
   // It isn't possible for the manager to reload itself
  @@ -1088,7 +1091,8 @@
   log("sessions: Session information for web application at '" + 
path + "'");
   
   if ((path == null) || (!path.startsWith("/") && path.equals(""))) {
  -writer.println(sm.getString("managerServlet.invalidPath", path));
  +writer.println(sm.getString("managerServlet.invalidPath",
  +RequestUtil.filter(path)));
   return;
   }
   String displayPath = path;
  @@ -1097,7 +1101,8 @@
   try {
   Context context = (Context) host.findChild(path);
   if (context == null) {
  -writer.println(sm.getString("managerServlet.noContext", 
displayPath));
  +writer.println(sm.getString("managerServlet.noContext",
  +
RequestUtil.filter(displayPath)));
   return;
   }
   writer.println(sm.getString("managerServlet.sessions", 
displayPath));
  @@ -1152,7 +1157,8 @@
   log("start: Starting web application at '" + path + "'");
   
   if ((path ==

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-10-14 Thread yoavs 
yoavs   2004/10/14 10:26:48

  Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 HTMLManagerServlet.java
  Log:
  Bugzilla 31707
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.70.2.52 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.51
  retrieving revision 1.70.2.52
  diff -u -r1.70.2.51 -r1.70.2.52
  --- changelog.xml 10 Oct 2004 20:42:32 -  1.70.2.51
  +++ changelog.xml 14 Oct 2004 17:26:48 -  1.70.2.52
  @@ -45,6 +45,9 @@
   
 
   
  +  
  +31707: Broken JavaScript confirmation in HTML manager. (yoavs)
  +  
   
 
   
  
  
  
  No   revision
  No   revision
  1.12.2.3  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- HTMLManagerServlet.java   17 Sep 2004 19:52:04 -  1.12.2.2
  +++ HTMLManagerServlet.java   14 Oct 2004 17:26:48 -  1.12.2.3
  @@ -593,9 +593,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -603,10 +603,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-10-14 Thread yoavs 
yoavs   2004/10/14 10:25:32

  Modified:webapps/docs changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  Bugzilla 31707
  
  Revision  ChangesPath
  1.146 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- changelog.xml 10 Oct 2004 20:43:49 -  1.145
  +++ changelog.xml 14 Oct 2004 17:25:32 -  1.146
  @@ -63,6 +63,9 @@
   
 
   
  +  
  +31707: Broken JavaScript confirmation in HTML manager. (yoavs)
  +  
   
 
   
  
  
  
  1.17  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- HTMLManagerServlet.java   23 Sep 2004 07:03:27 -  1.16
  +++ HTMLManagerServlet.java   14 Oct 2004 17:25:32 -  1.17
  @@ -571,9 +571,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -581,10 +581,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-09-17 Thread yoavs 
yoavs   2004/09/17 12:52:04

  Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 HTMLManagerServlet.java
  Log:
  Bugzilla 29485: MessageFormat requires double-quoting of single quotes.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.70.2.34 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.33
  retrieving revision 1.70.2.34
  diff -u -r1.70.2.33 -r1.70.2.34
  --- changelog.xml 15 Sep 2004 18:40:38 -  1.70.2.33
  +++ changelog.xml 17 Sep 2004 19:52:04 -  1.70.2.34
  @@ -84,6 +84,9 @@
 
   Added JavaScript confirmation for "dangerous" manager tasks. (yoavs)
 
  +  
  +29485: Added JavaScript confirmation prompts to HTML Manager 
actions. (yoavs)
  +  
   
 
 
  
  
  
  No   revision
  No   revision
  1.12.2.2  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- HTMLManagerServlet.java   2 Sep 2004 19:18:07 -   1.12.2.1
  +++ HTMLManagerServlet.java   17 Sep 2004 19:52:04 -  1.12.2.2
  @@ -593,9 +593,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -603,10 +603,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-09-17 Thread yoavs 
yoavs   2004/09/17 12:50:20

  Modified:webapps/docs changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  Bugzilla 29485, MessageFormat needs double-quoted single quotes.
  
  Revision  ChangesPath
  1.107 +5 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- changelog.xml 15 Sep 2004 19:23:45 -  1.106
  +++ changelog.xml 17 Sep 2004 19:50:19 -  1.107
  @@ -54,6 +54,11 @@
 
   
 
  +
  +  
  +29485: I broke the HTML manager when adding JavaScript 
confirmation, fixed now ;) (yoavs)
  +  
  +
 
   
   
  
  
  
  1.15  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- HTMLManagerServlet.java   2 Sep 2004 19:13:38 -   1.14
  +++ HTMLManagerServlet.java   17 Sep 2004 19:50:20 -  1.15
  @@ -567,9 +567,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -577,10 +577,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-09-02 Thread yoavs 
yoavs   2004/09/02 12:18:07

  Modified:webapps/docs Tag: TOMCAT_5_0 changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
Tag: TOMCAT_5_0 HTMLManagerServlet.java
  Log:
  Added JavaScript confirmation for "dangerous" manager tasks.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.70.2.29 +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.70.2.28
  retrieving revision 1.70.2.29
  diff -u -r1.70.2.28 -r1.70.2.29
  --- changelog.xml 2 Sep 2004 18:51:00 -   1.70.2.28
  +++ changelog.xml 2 Sep 2004 19:18:07 -   1.70.2.29
  @@ -67,6 +67,9 @@
 
   29526: Manager redeployment locked JAR because of context.xml 
stream. (yoavs)
 
  +  
  +Added JavaScript confirmation for "dangerous" manager tasks. (yoavs)
  +  
   
 
 
  
  
  
  No   revision
  No   revision
  1.12.2.1  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- HTMLManagerServlet.java   26 May 2004 16:41:49 -  1.12
  +++ HTMLManagerServlet.java   2 Sep 2004 19:18:07 -   1.12.2.1
  @@ -593,9 +593,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -603,10 +603,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java LocalStrings.properties

2004-09-02 Thread yoavs 
yoavs   2004/09/02 12:13:38

  Modified:webapps/docs changelog.xml
   webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java LocalStrings.properties
  Log:
  Added JavaScript confirmation dialogs to "dangerous" manager servlet links.
  
  Revision  ChangesPath
  1.99  +3 -0  jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- changelog.xml 2 Sep 2004 12:53:57 -   1.98
  +++ changelog.xml 2 Sep 2004 19:13:38 -   1.99
  @@ -81,6 +81,9 @@
  
   Major documentation update with current Tomcat 5.5 changes. (remm)
 
  +  
  +Added JavaScript confirmation dialog to "dangerous" Manager servler links. 
(yoavs)
  +  
   
 
   
  
  
  
  1.14  +6 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- HTMLManagerServlet.java   27 Jul 2004 07:18:37 -  1.13
  +++ HTMLManagerServlet.java   2 Sep 2004 19:13:38 -   1.14
  @@ -567,9 +567,9 @@
   " \n" +
   "  \n" +
   "   {1} \n" +
  -"   {3} \n" +
  -"   {5} \n" +
  -"   {7} \n" +
  +"   {3} \n" +
  +"   {5} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  @@ -577,10 +577,10 @@
   private static final String STOPPED_APPS_ROW_BUTTON_SECTION =
   " \n" +
   "  \n" +
  -"   {1} \n" +
  +"   {1} \n" +
   "   {3} \n" +
   "   {5} \n" +
  -"   {7} \n" +
  +"   {7} \n" +
   "  \n" +
   " \n" +
   "\n";
  
  
  
  1.5   +1 -1  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/LocalStrings.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocalStrings.properties   22 Sep 2003 12:34:45 -  1.4
  +++ LocalStrings.properties   2 Sep 2004 19:13:38 -   1.5
  @@ -58,7 +58,7 @@
   managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or 
undeploy itself
   managerServlet.noWrapper=Container has not called setWrapper() for this servlet
   managerServlet.reloaded=OK - Reloaded application at context path {0}
  -managerServlet.undeployd=OK - Undeployd application at context path {0}
  +managerServlet.undeployd=OK - Undeployed 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
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java ManagerServlet.java

2004-07-27 Thread remm 
remm2004/07/27 00:18:37

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java ManagerServlet.java
  Log:
  - Rewrite the manager for the new deployer.
  - I only tested the basic stuff, using the HTML manager, so there will likely be 
issues.
  
  Revision  ChangesPath
  1.13  +22 -48
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- HTMLManagerServlet.java   26 May 2004 16:41:49 -  1.12
  +++ HTMLManagerServlet.java   27 Jul 2004 07:18:37 -  1.13
  @@ -21,8 +21,6 @@
   import java.io.IOException;
   import java.io.PrintWriter;
   import java.io.StringWriter;
  -import java.net.URL;
  -import java.net.MalformedURLException;
   import java.text.MessageFormat;
   import java.util.Iterator;
   import java.util.List;
  @@ -31,8 +29,9 @@
   import javax.servlet.ServletException;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  +
  +import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  -import org.apache.catalina.Host;
   import org.apache.catalina.util.ServerInfo;
   import org.apache.commons.fileupload.FileItem;
   import org.apache.commons.fileupload.DiskFileUpload;
  @@ -150,7 +149,6 @@
   
   // Parse the request
   String basename = null;
  -File appBaseDir = null;
   String war = null;
   FileItem warUpload = null;
   try {
  @@ -191,28 +189,25 @@
   }
   // Identify the appBase of the owning Host of this Context
   // (if any)
  -String appBase = null;
  -appBase = ((Host) context.getParent()).getAppBase();
  -appBaseDir = new File(appBase);
  -if (!appBaseDir.isAbsolute()) {
  -appBaseDir = new File(System.getProperty("catalina.base"),
  -  appBase);
  -}
   basename = war.substring(0, war.indexOf(".war"));
  -File file = new File(appBaseDir, war);
  +File file = new File(getAppBase(), war);
   if (file.exists()) {
   message = sm.getString
   ("htmlManagerServlet.deployUploadWarExists",war);
   break;
   }
  -warUpload.write(file);
  -try {
  -URL url = file.toURL();
  -war = url.toString();
  -war = "jar:" + war + "!/";
  -} catch(MalformedURLException e) {
  -file.delete();
  -throw e;
  +String path = null;
  +if (basename.equals("ROOT")) {
  +path = "";
  +} else {
  +path = "/" + basename;
  +}
  +
  +if (!isServiced(path)) {
  +addServiced(path);
  +warUpload.write(file);
  +check(path);
  +removeServiced(path);
   }
   break;
   }
  @@ -227,30 +222,6 @@
   warUpload = null;
   }
   
  -// Extract the nested context deployment file (if any)
  -File localWar = new File(appBaseDir, basename + ".war");
  -File localXml = new File(configBase, basename + ".xml");
  -try {
  -extractXml(localWar, localXml);
  -} catch (IOException e) {
  -log("managerServlet.extract[" + localWar + "]", e);
  -return;
  -}
  -String config = null;
  -try {
  -if (localXml.exists()) {
  -URL url = localXml.toURL();
  -config = url.toString();
  -}
  -} catch (MalformedURLException e) {
  -throw e;
  -}
  -
  -// If there were no errors, deploy the WAR
  -if (message.length() == 0) {
  -message = deployInternal(config, null, war);
  -}
  -
   list(request, response, message);
   }
   
  @@ -287,7 +258,7 @@
   
   if (debug >= 1)
   log("list: Listing contexts for virtual host '" +
  -deployer.getName() + "'");
  +host.getName() + "'");
   
   PrintWriter writer = response.getWriter();
   
  @@ -337,7 +308,10 @@
   
   // Apps Row Section
   // Create sorted map of deployed applications

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-05-26 Thread yoavs 
yoavs   2004/05/26 09:41:50

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  Minor JavaDoc fixes (Bugzilla 28335)
  
  Revision  ChangesPath
  1.12  +3 -2  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- HTMLManagerServlet.java   8 May 2004 11:05:46 -   1.11
  +++ HTMLManagerServlet.java   26 May 2004 16:41:49 -  1.12
  @@ -277,7 +277,8 @@
* Render a HTML list of the currently active Contexts in our virtual host,
* and memory and server status information.
*
  - * @param writer Writer to render to
  + * @param request The request
  + * @param response The response
* @param message a message to display
*/
   public void list(HttpServletRequest request,
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2004-05-08 Thread markt 
markt   2004/05/08 04:05:46

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  Fix bug 21502. Obtain number of active sessions directly.
- Takes advantage of new method in o.a.c.Manager interface.
- Patch provided by Angus Mezick.
  
  Remove unused imports identified by Eclipse.
  
  Revision  ChangesPath
  1.11  +2 -4  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- HTMLManagerServlet.java   27 Feb 2004 14:59:07 -  1.10
  +++ HTMLManagerServlet.java   8 May 2004 11:05:46 -   1.11
  @@ -24,7 +24,6 @@
   import java.net.URL;
   import java.net.MalformedURLException;
   import java.text.MessageFormat;
  -import java.util.Date;
   import java.util.Iterator;
   import java.util.List;
   import java.util.Map;
  @@ -37,7 +36,6 @@
   import org.apache.catalina.util.ServerInfo;
   import org.apache.commons.fileupload.FileItem;
   import org.apache.commons.fileupload.DiskFileUpload;
  -import org.apache.commons.fileupload.FileUploadException;
   
   /**
   * Servlet that enables remote management of the web applications deployed
  @@ -375,7 +373,7 @@
"/html/sessions?path=" + displayPath);
   if (context.getManager() != null) {
   args[4] = new Integer
  -(context.getManager().findSessions().length);
  +(context.getManager().getActiveSessions());
   } else {
   args[4] = new Integer(0);
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2003-11-03 Thread remm 
remm2003/11/03 14:01:38

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  - Avoid NPE (which renders the HTML servlet unusable) if a context hasn't
been started successfully.
  - Bug 24349.
  - Submitted by Ferenc Dobi.
  
  Revision  ChangesPath
  1.9   +10 -6 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HTMLManagerServlet.java   7 Sep 2003 18:47:14 -   1.8
  +++ HTMLManagerServlet.java   3 Nov 2003 22:01:38 -   1.9
  @@ -420,8 +420,12 @@
   args[3] = response.encodeURL
   (request.getContextPath() +
"/html/sessions?path=" + displayPath);
  -args[4] =
  -new Integer(context.getManager().findSessions().length);
  +if (context.getManager() != null) {
  +args[4] = new Integer
  +(context.getManager().findSessions().length);
  +} else {
  +args[4] = new Integer(0);
  +}
   writer.print
   (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2003-07-25 Thread remm 
remm2003/07/25 09:41:46

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  - Fix regression: error message when deploying a webapp which doesn't have
a META-INF/context.xml (oops).
  
  Revision  ChangesPath
  1.6   +8 -6  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- HTMLManagerServlet.java   25 Jul 2003 16:01:37 -  1.5
  +++ HTMLManagerServlet.java   25 Jul 2003 16:41:46 -  1.6
  @@ -294,8 +294,10 @@
   }
   String config = null;
   try {
  -URL url = localXml.toURL();
  -config = url.toString();
  +if (localXml.exists()) {
  +URL url = localXml.toURL();
  +config = url.toString();
  +}
   } catch (MalformedURLException e) {
   throw e;
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2003-07-25 Thread remm 
remm2003/07/25 09:01:37

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  - Allow the posted WAR to include a META-INF/context.xml, similar to the
upload Ant task, for consistency.
  
  Revision  ChangesPath
  1.5   +26 -7 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HTMLManagerServlet.java   22 Jun 2003 16:41:36 -  1.4
  +++ HTMLManagerServlet.java   25 Jul 2003 16:01:37 -  1.5
  @@ -205,6 +205,8 @@
   upload.setRepositoryPath(tempdir.getCanonicalPath());
   
   // Parse the request
  +String basename = null;
  +File appBaseDir = null;
   String war = null;
   FileItem warUpload = null;
   try {
  @@ -224,7 +226,7 @@
   }
   }
   }
  -while(true) {
  +while (true) {
   if (warUpload == null) {
   message = sm.getString
   ("htmlManagerServlet.deployUploadNoFile");
  @@ -246,13 +248,13 @@
   // Identify the appBase of the owning Host of this Context
   // (if any)
   String appBase = null;
  -File appBaseDir = null;
   appBase = ((Host) context.getParent()).getAppBase();
   appBaseDir = new File(appBase);
   if (!appBaseDir.isAbsolute()) {
   appBaseDir = new File(System.getProperty("catalina.base"),
 appBase);
   }
  +basename = war.substring(0, war.indexOf(".war"));
   File file = new File(appBaseDir, war);
   if (file.exists()) {
   message = sm.getString
  @@ -281,9 +283,26 @@
   warUpload = null;
   }
   
  +// Extract the nested context deployment file (if any)
  +File localWar = new File(appBaseDir, basename + ".war");
  +File localXml = new File(configBase, basename + ".xml");
  +try {
  +extractXml(localWar, localXml);
  +} catch (IOException e) {
  +log("managerServlet.extract[" + localWar + "]", e);
  +return;
  +}
  +String config = null;
  +try {
  +URL url = localXml.toURL();
  +config = url.toString();
  +} catch (MalformedURLException e) {
  +throw e;
  +}
  +
   // If there were no errors, deploy the WAR
   if (message.length() == 0) {
  -message = deployInternal(null, null, war);
  +message = deployInternal(config, null, war);
   }
   
   list(request, response, message);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java ManagerServlet.java

2003-06-22 Thread remm 
remm2003/06/22 09:41:36

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java ManagerServlet.java
  Log:
  - Fix URL when doing a remote deploy (despite the error message, the app
would be correctly deployed a little bit later by the auto deployer).
  - Undeploy now also removes the WAR.
  
  Revision  ChangesPath
  1.4   +5 -8  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HTMLManagerServlet.java   15 Jun 2003 18:31:45 -  1.3
  +++ HTMLManagerServlet.java   22 Jun 2003 16:41:36 -  1.4
  @@ -253,15 +253,13 @@
   appBaseDir = new File(System.getProperty("catalina.base"),
 appBase);
   }
  -File file = new File(appBaseDir,war);
  +File file = new File(appBaseDir, war);
   if (file.exists()) {
   message = sm.getString
   ("htmlManagerServlet.deployUploadWarExists",war);
   break;
   }
   warUpload.write(file);
  -war = file.getAbsolutePath();
  -/*
   try {
   URL url = file.toURL();
   war = url.toString();
  @@ -270,7 +268,6 @@
   file.delete();
   throw e;
   }
  -*/
   break;
   }
   } catch(Exception e) {
  
  
  
  1.3   +9 -31 
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ManagerServlet.java   15 Jun 2003 18:31:45 -  1.2
  +++ ManagerServlet.java   22 Jun 2003 16:41:36 -  1.3
  @@ -454,19 +454,6 @@
   command));
   }
   
  -// Saving configuration
  -/*
  -Server server = ServerFactory.getServer();
  -if ((server != null) && (server instanceof StandardServer)) {
  -try {
  -((StandardServer) server).storeConfig();
  -} catch (Exception e) {
  -writer.println(sm.getString("managerServlet.saveFail",
  -e.getMessage()));
  -}
  -}
  -*/
  -
   // Finish up the response
   writer.flush();
   writer.close();
  @@ -1391,8 +1378,12 @@
   deployer.remove(path);
   if (docBaseDir.isDirectory()) {
   undeployDir(docBaseDir);
  +// Delete the WAR file
  +File docBaseWar = new File(docBasePath + ".war");
  +docBaseWar.delete();
   } else {
  -docBaseDir.delete();  // Delete the WAR file
  +// Delete the WAR file
  +docBaseDir.delete();
   }
   File docBaseXml = new File(configBase, context.getPath() + ".xml");
   docBaseXml.delete();
  @@ -1404,19 +1395,6 @@
   writer.println(sm.getString("managerServlet.exception",
   t.toString()));
   }
  -
  -// Saving configuration
  -/*
  -Server server = ServerFactory.getServer();
  -if ((server != null) && (server instanceof StandardServer)) {
  -try {
  -((StandardServer) server).storeConfig();
  -} catch (Exception e) {
  -writer.println(sm.getString("managerServlet.saveFail",
  -e.getMessage()));
  -}
  -}
  -*/
   
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java LocalStrings.properties ManagerServlet.java

2003-06-15 Thread remm 
remm2003/06/15 11:31:45

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java LocalStrings.properties
ManagerServlet.java
  Log:
  - Update the manager to implement the new functionality as described in the docs.
  - Pausing won't be implemented, due to difficulties, and the likelihood of bringing
the whole server to its knees (thanks to Glenn for poiting that out).
  - Versioning is not tested yet.
  - Known issue: locking occurs on an uploaded WAR, for reasons which
elude me right now.
  - Known issue 2: to deploy local WARs, a jar:file: URL must be used.
  
  Revision  ChangesPath
  1.3   +53 -50
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTMLManagerServlet.java   4 Jun 2003 07:58:58 -   1.2
  +++ HTMLManagerServlet.java   15 Jun 2003 18:31:45 -  1.3
  @@ -88,7 +88,7 @@
   import org.apache.commons.fileupload.FileUploadException;
   
   /**
  -* Servlet that enables remote management of the web applications installed
  +* Servlet that enables remote management of the web applications deployed
   * within the same virtual host as this web application is.  Normally, this
   * functionality will be protected by a security constraint in the web
   * application deployment descriptor.  However, this requirement can be
  @@ -131,9 +131,9 @@
   String command = request.getPathInfo();
   
   String path = request.getParameter("path");
  -String installPath = request.getParameter("installPath");
  -String installConfig = request.getParameter("installConfig");
  -String installWar = request.getParameter("installWar");
  +String deployPath = request.getParameter("deployPath");
  +String deployConfig = request.getParameter("deployConfig");
  +String deployWar = request.getParameter("deployWar");
   
   // Prepare our output writer to generate the response message
   Locale locale = Locale.getDefault();
  @@ -144,13 +144,13 @@
   String message = "";
   // Process the requested command
   if (command == null || command.equals("/")) {
  -} else if (command.equals("/install")) {
  -message = install(installConfig, installPath, installWar);
  +} else if (command.equals("/deploy")) {
  +message = deployInternal(deployConfig, deployPath, deployWar);
   } else if (command.equals("/list")) {
   } else if (command.equals("/reload")) {
   message = reload(path);
  -} else if (command.equals("/remove")) {
  -message = remove(path);
  +} else if (command.equals("/undeploy")) {
  +message = undeploy(path);
   } else if (command.equals("/sessions")) {
   message = sessions(path);
   } else if (command.equals("/start")) {
  @@ -216,7 +216,7 @@
   FileItem item = (FileItem) iter.next();
   
   if (!item.isFormField()) {
  -if (item.getFieldName().equals("installWar") &&
  +if (item.getFieldName().equals("deployWar") &&
   warUpload == null) {
   warUpload = item;
   } else {
  @@ -227,13 +227,13 @@
   while(true) {
   if (warUpload == null) {
   message = sm.getString
  -("htmlManagerServlet.installUploadNoFile");
  +("htmlManagerServlet.deployUploadNoFile");
   break;
   }
   war = warUpload.getName();
   if (!war.toLowerCase().endsWith(".war")) {
   message = sm.getString
  -("htmlManagerServlet.installUploadNotWar",war);
  +("htmlManagerServlet.deployUploadNotWar",war);
   break;
   }
   // Get the filename if uploaded name includes a path
  @@ -256,10 +256,12 @@
   File file = new File(appBaseDir,war);
   if (file.exists()) {
   message = sm.getString
  -("htmlManagerServlet.installUploadWarExists",war);
  +("htmlManagerServlet.deployUploadWarExists",war);
   break;
   }
   warUpload.write(file);
  +war = file.getAbsolutePath();
  +/*
   try {

cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java

2003-06-04 Thread billbarker 
billbarker2003/06/04 00:58:59

  Modified:webapps/manager/WEB-INF/classes/org/apache/catalina/manager
HTMLManagerServlet.java
  Log:
  Update to use the commons-fileupload-rc1 interface.
  
  Submitted by: Martin Cooper [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.2   +7 -7  
jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HTMLManagerServlet.java   26 Mar 2003 09:49:18 -  1.1
  +++ HTMLManagerServlet.java   4 Jun 2003 07:58:58 -   1.2
  @@ -84,7 +84,7 @@
   import org.apache.catalina.Host;
   import org.apache.catalina.util.ServerInfo;
   import org.apache.commons.fileupload.FileItem;
  -import org.apache.commons.fileupload.FileUpload;
  +import org.apache.commons.fileupload.DiskFileUpload;
   import org.apache.commons.fileupload.FileUploadException;
   
   /**
  @@ -195,7 +195,7 @@
   String message = "";
   
   // Create a new file upload handler
  -FileUpload upload = new FileUpload();
  +DiskFileUpload upload = new DiskFileUpload();
   
   // Get the tempdir
   File tempdir = (File) getServletContext().getAttribute
  @@ -259,7 +259,7 @@
   ("htmlManagerServlet.installUploadWarExists",war);
   break;
   }
  -warUpload.write(file.getCanonicalPath());
  +warUpload.write(file);
   try {
   URL url = file.toURL();
   war = url.toString();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]