cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets HTMLManagerServlet.java ManagerServlet.java

[remm]

remm        2002/09/18 07:13:46

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        HTMLManagerServlet.java ManagerServlet.java
  Log:
  - Port patches.
  
  Revision  Changes    Path
  1.3       +7 -24     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/HTMLManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- HTMLManagerServlet.java   12 Sep 2002 06:44:25 -0000      1.2
  +++ HTMLManagerServlet.java   18 Sep 2002 14:13:45 -0000      1.3
  @@ -224,9 +224,6 @@
   
           for (int i = 0; i < contextPaths.length; i++) {
               String displayPath = contextPaths[i];
  -            if (displayPath.equals("")) {
  -                displayPath = "/";
  -            }
               sortedContextPathsMap.put(displayPath, contextPaths[i]);
           }
   
  @@ -241,6 +238,9 @@
               String displayPath = (String) entry.getKey();
               String contextPath = (String) entry.getKey();
               Context context = deployer.findDeployedApp(contextPath);
  +            if (displayPath.equals("")) {
  +                displayPath = "/";
  +            }
   
               if (context != null ) {
                   args = new Object[6];
  @@ -269,14 +269,6 @@
                           STOPPED_APPS_ROW_BUTTON_SECTION, args));
                   }
   
  -            } else if (displayPath.equals("/")) {
  -                args = new Object[4];
  -                args[0] = displayPath;
  -                args[1] = "ROOT";
  -                args[2] = new Boolean(true);
  -                args[3] = "-";
  -                writer.print
  -                    (MessageFormat.format(APPS_ROOT_ROW_SECTION, args));
               }
           }
   
  @@ -537,15 +529,6 @@
           "  &nbsp;<a href=\"remove?path={0}\">{4}</a>&nbsp; \n" +
           "  </small> \n" +
           " </td> \n" +
  -        "</tr> \n";
  -
  -    private static final String APPS_ROOT_ROW_SECTION =
  -        "<tr> \n" +
  -        " <td class=\"row-left\"><small><a href=\"{0}\">{0}</a></small></td>\n" +
  -        " <td class=\"row-left\"><small>{1}</small></td> \n" +
  -        " <td class=\"row-center\"><small>{2}</small></td> \n" +
  -        " <td class=\"row-center\"><small>{3}</small></td> \n" +
  -        " <td class=\"row-right\">&nbsp;</td> \n" +
           "</tr> \n";
   
       private static final String INSTALL_SECTION =
  
  
  
  1.3       +6 -7      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java
  
  Index: ManagerServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/ManagerServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ManagerServlet.java       12 Sep 2002 06:44:25 -0000      1.2
  +++ ManagerServlet.java       18 Sep 2002 14:13:45 -0000      1.3
  @@ -502,9 +502,8 @@
               return;
           }
           String displayPath = path;
  -        if (displayPath.equals("")) {
  -            displayPath = "/";
  -        }
  +        if( path.equals("/") )
  +            path = "";
           String basename = null;
           if (path.equals("")) {
               basename = "_";
  
  
  

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