tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manv...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/service service.jsp
Date Fri, 22 Mar 2002 01:31:26 GMT
manveen     02/03/21 17:31:25

  Modified:    webapps/admin context.jsp
               webapps/admin/WEB-INF struts-config.xml
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
                        ApplicationResources_es.properties
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger
                        SaveLoggerAction.java
               webapps/admin/host host.jsp
               webapps/admin/realm userDatabaseRealm.jsp
               webapps/admin/service service.jsp
  Added:       webapps/admin/realm realms.jsp
  Log:
  - "add" and "delete" loggers operational and enabled from pages.
  - delete "realm" operation enabled/complete.
  
  Revision  Changes    Path
  1.7       +8 -5      jakarta-tomcat-4.0/webapps/admin/context.jsp
  
  Index: context.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/context.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- context.jsp	21 Mar 2002 19:03:05 -0000	1.6
  +++ context.jsp	22 Mar 2002 01:31:24 -0000	1.7
  @@ -45,11 +45,14 @@
               <controls:action url="">  <bean:message key="actions.requestfilter.create"/>
</controls:action>
               <controls:action url="">  <bean:message key="actions.requestfilter.delete"/>
</controls:action>
               <controls:action> ------------------------------------- </controls:action>
  -            <controls:action url="">  <bean:message key="actions.userrealm.create"/>
</controls:action>
  -            <controls:action url="">  <bean:message key="actions.userrealm.delete"/>
</controls:action>
  -            <controls:action> ------------------------------------- </controls:action>
  -            <controls:action url="">  <bean:message key="actions.valve.create"/>
</controls:action>
  -            <controls:action url="">  <bean:message key="actions.valve.delete"/>
</controls:action>
  +            <controls:action url="">  <bean:message key="actions.realms.create"/>
</controls:action>
  +            <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  +                                  URLEncoder.encode(thisObjectName) %>'> 
  +                <bean:message key="actions.realms.deletes"/> 
  +            </controls:action>
  +            <controls:action disabled="true">  -------------------------------------
 </controls:action>
  +            <controls:action url="">  <bean:message key="actions.valves.create"/>
</controls:action>
  +            <controls:action url="">  <bean:message key="actions.valves.deletes"/>
</controls:action>
               <controls:action> --------------------------------- </controls:action>
               <controls:action url="">  <bean:message key="actions.thiscontext.delete"/>
</controls:action>
              --%>
  
  
  
  1.38      +7 -0      jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/struts-config.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- struts-config.xml	21 Mar 2002 19:03:05 -0000	1.37
  +++ struts-config.xml	22 Mar 2002 01:31:25 -0000	1.38
  @@ -69,6 +69,9 @@
       <form-bean      name="userDatabaseRealmForm"
                       type="org.apache.webapp.admin.realm.UserDatabaseRealmForm"/>
   
  +    <form-bean      name="realmsForm"
  +                    type="org.apache.webapp.admin.realm.RealmsForm"/>
  +
       <!-- ========== User Database Module ========== -->
   
       <form-bean      name="databaseForm"
  @@ -188,6 +191,10 @@
   
       <forward        name="UserDatabaseRealm"
                       path="/realm/userDatabaseRealm.jsp"
  +                redirect="false"/>
  +
  +    <forward        name="Realms"
  +                    path="/realm/realms.jsp"
                   redirect="false"/>
           
       <!-- ========== User Database Module ========== -->
  
  
  
  1.36      +6 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ApplicationResources_en.properties	21 Mar 2002 19:03:05 -0000	1.35
  +++ ApplicationResources_en.properties	22 Mar 2002 01:31:25 -0000	1.36
  @@ -84,14 +84,16 @@
   actions.loggers.delete=Delete This Logger
   actions.loggers.deletes=Delete Existing Loggers
   actions.loggers.edit=Edit Existing Logger
  +actions.realms.create=Create New User Realm
  +actions.realms.delete=Delete This User Realm
  +actions.realms.deletes=Delete User Realms
   actions.requestfilter.create=Create New Request Filter
   actions.requestfilter.delete=Delete Request Filters
   actions.user.create=Create New User
   actions.user.delete=Delete Existing User
  -actions.userrealm.create=Create New User Realm
  -actions.userrealm.delete=Delete User Realms
  -actions.valve.create=Create New Valve
  -actions.valve.delete=Delete Valves
  +actions.valves.create=Create New Valve
  +actions.valves.delete=Delete This Valve
  +actions.valves.deletes=Delete Valves
   actions.thisconnector.delete=Delete This connector
   actions.alias.create=Create New Aliases
   actions.alias.delete=Delete Aliases
  
  
  
  1.31      +6 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ApplicationResources_es.properties	21 Mar 2002 19:03:05 -0000	1.30
  +++ ApplicationResources_es.properties	22 Mar 2002 01:31:25 -0000	1.31
  @@ -84,14 +84,16 @@
   actions.loggers.delete=Eliminar este Logger
   actions.loggers.deletes=Eliminar (Logger) Registradores
   actions.loggers.edit=Corrija existente el Logger
  +actions.realms.create=Cree El Nuevo Reino de Usuario
  +actions.realms.delete=Eliminar este Reino de Usuario
  +actions.realms.deletes=Eliminar Reinos de Usuario
   actions.requestfilter.create=Cree El Filtro Nuevo de la Petici\u00f3n
   actions.requestfilter.delete=Filtros de la Petici\u00f3n de la Cancelaci\u00f3n
   actions.user.create=Crear Nuevo Utilizador
   actions.user.delete=Utilizador existente de la cancelacion
  -actions.userrealm.create=Cree El Nuevo Reino de Usuario
  -actions.userrealm.delete=Eliminar Reinos de Usuario
  -actions.valve.create=Crear Nueva V\u00e1lvula
  -actions.valve.delete=Eliminar Valvulas
  +actions.valves.create=Crear Nueva V\u00e1lvula
  +actions.valves.delete=Eliminar este V\u00e1lvula
  +actions.valves.deletes=Eliminar V\u00e1lvulas
   actions.service.delete=Eliminar este servicio
   actions.thisconnector.delete=Eliminar este conector
   actions.alias.create=Cree Los Nuevos Pseudonimos
  
  
  
  1.3       +11 -14    jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java
  
  Index: SaveLoggerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SaveLoggerAction.java	21 Mar 2002 17:11:28 -0000	1.2
  +++ SaveLoggerAction.java	22 Mar 2002 01:31:25 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java,v
1.2 2002/03/21 17:11:28 manveen Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/03/21 17:11:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/logger/SaveLoggerAction.java,v
1.3 2002/03/22 01:31:25 manveen Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/03/22 01:31:25 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * <em>Edit Logger</em> transactions.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.2 $ $Date: 2002/03/21 17:11:28 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/22 01:31:25 $
    */
   
   public final class SaveLoggerAction extends Action {
  @@ -179,17 +179,16 @@
                   String parent = lform.getParentObjectName();                
                   String objectName = DeleteLoggerAction.getObjectName(parent);
                   
  -                ObjectName pname = new ObjectName(parent);                            
   
  +                ObjectName pname = new ObjectName(parent);
                   StringBuffer sb = new StringBuffer(pname.getDomain());                
   
                   
  -                // System.out.println("Parent mBean = " + parent);
  -                // FIX ME-- should Service be converted to Engine,
  -                // as createLogger in MBeanFactory requires Engine ObjectName??       
      
  -                try {                        
  +                // For service, create the corresponding Engine mBean  
  +                // Parent in this case needs to be the container mBean for the service

  +                try {                                                        
                       if ("Service".equalsIgnoreCase(pname.getKeyProperty("type"))) {
                           sb.append(":type=Engine,service=");
                           sb.append(pname.getKeyProperty("name"));
  -                        objectName = sb.toString();
  +                        parent = sb.toString();
                       }
                   } catch (Exception e) {
                       String message =
  @@ -199,7 +198,7 @@
                       response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
                       return (null);
                   }
  -                
  +                                                
                   // Ensure that the requested logger name is unique
                   ObjectName oname =
                       new ObjectName(objectName);
  @@ -222,13 +221,11 @@
                   lObjectName = (String)
                       mBServer.invoke(fname, operation,
                                       values, createStandardLoggerTypes);
  -               
                   // Add the new Logger to our tree control node
                   TreeControl control = (TreeControl)
                       session.getAttribute("treeControlTest");
                   if (control != null) {
  -                    //String parentName = TomcatTreeBuilder.SERVER_TYPE;
  -                    TreeControlNode parentNode = control.findNode(parent);
  +                    TreeControlNode parentNode = control.findNode(lform.getParentObjectName());
                       if (parentNode != null) {
                           String nodeLabel =
                              "Logger for " + parentNode.getLabel();
  
  
  
  1.8       +15 -6     jakarta-tomcat-4.0/webapps/admin/host/host.jsp
  
  Index: host.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/host/host.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- host.jsp	21 Mar 2002 19:03:06 -0000	1.7
  +++ host.jsp	22 Mar 2002 01:31:25 -0000	1.8
  @@ -51,11 +51,11 @@
               <controls:action url="">  <bean:message key="actions.alias.create"/>
</controls:action>
               <controls:action url="">  <bean:message key="actions.alias.delete"/>
</controls:action>
               </controls:action>
  +            --%>
               <controls:action url='<%= "/AddLogger.do?parent=" + 
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.loggers.create"/>
               </controls:action>              
  -            --%>
               <controls:action url='<%= "/DeleteLogger.do?parent=" + 
                                     URLEncoder.encode(thisObjectName) %>'> 
                   <bean:message key="actions.loggers.deletes"/> 
  @@ -65,13 +65,22 @@
               <controls:action url="">  <bean:message key="actions.requestfilter.create"/>
</controls:action>
               <controls:action url="">  <bean:message key="actions.requestfilter.delete"/>
</controls:action>
               <controls:action> ------------------------------------- </controls:action>
  -            <controls:action url="">  <bean:message key="actions.userrealm.create"/>
</controls:action>
  -            <controls:action url="">  <bean:message key="actions.userrealm.delete"/>
</controls:action>
  -            <controls:action> ------------------------------------- </controls:action>
  -            <controls:action url="">  <bean:message key="actions.valve.create"/>
</controls:action>
  -            <controls:action url="">  <bean:message key="actions.valve.delete"/>
</controls:action>
  +            <controls:action url="">  <bean:message key="actions.realms.create"/>
</controls:action>
  +            <controls:action url="">  <bean:message key="actions.realms.deletes"/>
</controls:action>
               <controls:action> ------------------------------------- </controls:action>
  +            <controls:action url="">  <bean:message key="actions.valves.create"/>
</controls:action>
  +            <controls:action url='<%= "/AddRealm.do?parent=" + 
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.create"/>
  +            </controls:action>              
               --%> 
  +            <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  +                                  URLEncoder.encode(thisObjectName) %>'> 
  +                <bean:message key="actions.realms.deletes"/> 
  +            </controls:action>
  +            <controls:action disabled="true"> 
  +                ------------------------------------- 
  +            </controls:action>
               <controls:action url='<%= "/DeleteHost.do?select=" + 
                                           URLEncoder.encode(thisObjectName) %>'>  
                   <bean:message key="actions.hosts.delete"/> 
  
  
  
  1.2       +8 -4      jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp
  
  Index: userDatabaseRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/userDatabaseRealm.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- userDatabaseRealm.jsp	21 Mar 2002 19:03:06 -0000	1.1
  +++ userDatabaseRealm.jsp	22 Mar 2002 01:31:25 -0000	1.2
  @@ -1,7 +1,8 @@
   <!-- Standard Struts Entries -->
  -<%@ page language="java" %>
  +<%@ page language="java" import="java.net.URLEncoder" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  +<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
   
   <html:html locale="true">
  @@ -35,9 +36,12 @@
         <controls:actions>
               <controls:action selected="true"> ----<bean:message key="actions.available.actions"/>----
</controls:action>
               <controls:action> --------------------------------- </controls:action>
  -            <%--
  -            <controls:action url="">  <bean:message key="actions.thisrealm.delete"/>
</controls:action>
  -            --%>
  +            <logic:notEqual name="userDatabaseRealmForm" property="adminAction" value="Create">
             
  +                <controls:action url='<%= "/DeleteRealm.do?select=" + 
  +                                        URLEncoder.encode(thisObjectName) %>'>  
  +                <bean:message key="actions.realms.delete"/> 
  +            </controls:action>           
  +           </logic:notEqual>          
          </controls:actions>   
            </div>
         </td>
  
  
  
  1.1                  jakarta-tomcat-4.0/webapps/admin/realm/realms.jsp
  
  Index: realms.jsp
  ===================================================================
  <!-- Standard Struts Entries -->
  <%@ page language="java" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ taglib uri="/WEB-INF/controls.tld" prefix="controls" %>
  
  <html:html locale="true">
  
  <%@ include file="../users/header.jsp" %>
  
  <!-- Body -->
  <body bgcolor="white">
  
  <!--Form -->
  
  <html:errors/>
  
  <html:form method="post" action="/DeleteRealms">
  
    <table width="100%" border="0" cellspacing="0" cellpadding="0">
      <tr bgcolor="7171A5">
        <td width="81%"> 
          <div class="page-title-text" align="left">
            <bean:message key="actions.realms.delete"/>
          </div>
        </td>
        <td width="19%"> 
          <div align="right">
              <controls:actions>
                <controls:action selected="true">
                  ----<bean:message key="actions.available.actions"/>----
                </controls:action>
                <controls:action disabled="true">
                  ---------------------------------
                </controls:action>
              </controls:actions>
          </div>
        </td>
      </tr>
    </table>
  
  <%@ include file="../buttons.jsp" %>    
    <br>
  
    <%-- Realms List --%>
  
    <table class="back-table" border="0" cellspacing="0" cellpadding="1"
           width="100%">
      <tr><td> 
  
        <table class="front-table" border="1"
         cellspacing="0" cellpadding="0" width="100%">
  
          <tr class="header-row">
            <td><div align="left" class="table-header-text">
              <bean:message key="actions.delete"/>
            </div></td>
            <td><div align="left" class="table-header-text">
              <bean:message key="host.name"/>
            </div></td>
          </tr>
  
          <logic:iterate name="realmsList" id="realm">
            <tr class="line-row">
              <td><div align="left" class="table-normal-text">&nbsp;
                <html:multibox property="realms"
                                  value="<%= realm.toString() %>"/>
              </div></td>
              <td><div align="left" class="table-normal-text">&nbsp;
                <html:link page='<%= "/EditRealm.do?select=" + 
                           java.net.URLEncoder.encode(realm.toString()) %>'>
                  <controls:attribute name="realm" attribute="className"/>
                </html:link>
              </div></td>
            </tr>
          </logic:iterate>
  
        </table>
  
      </td></tr>
    </table>
  
  <%@ include file="../buttons.jsp" %>
  
    <br>
  </html:form>
  
  <p>&nbsp;</p>
  </body>
  </html:html>
  
  
  
  1.9       +13 -11    jakarta-tomcat-4.0/webapps/admin/service/service.jsp
  
  Index: service.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/service/service.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- service.jsp	21 Mar 2002 19:03:06 -0000	1.8
  +++ service.jsp	22 Mar 2002 01:31:25 -0000	1.9
  @@ -79,12 +79,10 @@
                 <controls:action disabled="true">
                   -------------------------------------
                 </controls:action>
  -              <%--
                 <controls:action url='<%= "/AddLogger.do?parent=" + 
                                     URLEncoder.encode(thisObjectName) %>'>
                   <bean:message key="actions.loggers.create"/>
                 </controls:action>
  -              --%>
                 <controls:action url='<%= "/DeleteLogger.do?parent=" + 
                                     URLEncoder.encode(thisObjectName) %>'> 
                   <bean:message key="actions.loggers.deletes"/> 
  @@ -102,20 +100,24 @@
                 <controls:action>
                   -------------------------------------
                 </controls:action>
  -              <controls:action url="">
  -                <bean:message key="actions.userrealm.create"/>
  -              </controls:action>
  -              <controls:action url="">
  -                <bean:message key="actions.userrealm.delete"/>
  +            <controls:action url='<%= "/AddRealm.do?parent=" + 
  +                                  URLEncoder.encode(thisObjectName) %>'>
  +                <bean:message key="actions.realms.create"/>
  +            </controls:action>              
  +              --%>
  +              <controls:action url='<%= "/DeleteRealm.do?parent=" + 
  +                                  URLEncoder.encode(thisObjectName) %>'> 
  +                <bean:message key="actions.realms.deletes"/> 
                 </controls:action>
  -              <controls:action>
  -                -------------------------------------
  +              <controls:action disabled="true"> 
  +                ------------------------------------- 
                 </controls:action>
  +              <%--
                 <controls:action url="">
  -                <bean:message key="actions.valve.create"/>
  +                <bean:message key="actions.valves.create"/>
                 </controls:action>
                 <controls:action url="">
  -                <bean:message key="actions.valve.delete"/>
  +                <bean:message key="actions.valves.deletes"/>
                 </controls:action>
                 <controls:action>
                   -------------------------------------
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message