patrickl    01/12/16 11:40:20

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
                        ApplicationResources_es.properties
                        SetUpServerAction.java SetUpServiceAction.java
  Log:
  Internationalized the list of available actions. Added corresponding messages in 
ApplicationResource properties for english and spanish.
  Submitted by: Manveen Kaur
  
  Revision  Changes    Path
  1.8       +18 -0     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ApplicationResources_en.properties        2001/12/14 23:22:33     1.7
  +++ ApplicationResources_en.properties        2001/12/16 19:40:20     1.8
  @@ -38,3 +38,21 @@
   service.properties=Service Properties
   service.property=Property
   service.value=Value
  +actions.avaliable.actions=Available Actions
  +actions.services.create=Create New Service
  +actions.services.delete=Delete Services
  +actions.accesslogger.create=Create New Access Logger
  +actions.accesslogger.delete=Delete Access Logger
  +actions.connector.create=Create New Connector
  +actions.connector.delete=Delete Connectors
  +actions.host.create=Create New Host
  +actions.host.delete=Delete Hosts
  +actions.logger.create=Create New Logger
  +actions.logger.delete=Delete Loggers
  +actions.requestfilter.create=Create New Request Filter
  +actions.requestfilter.delete=Delete Request Filters
  +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.service.delete=Delete This Service
  
  
  
  1.10      +18 -0     
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApplicationResources_es.properties        2001/12/14 23:22:33     1.9
  +++ ApplicationResources_es.properties        2001/12/16 19:40:20     1.10
  @@ -38,3 +38,21 @@
   service.properties=Mantenga Las Caracteristicas
   service.property=Caracteristica
   service.value=Valor
  +actions.avaliable.actions=Disponibles Acciones
  +actions.services.create=Cree El Nuevo Servicio
  +actions.services.delete=Servicios De la Cancelaci\u00dbn
  +actions.accesslogger.create=Cree El Maderero Nuevo Del Acceso
  +actions.accesslogger.delete=Maderero Del Acceso De la Cancelaci\u00dbn
  +actions.connector.create=Cree Nuevo El Conector
  +actions.connector.delete=Conectores De la Cancelaci\u00dbn
  +actions.host.create=Cree El Nuevo Ordenador principal
  +actions.host.delete=Ordenadores principal De la Cancelaci\u00dbn
  +actions.logger.create=Cree Nuevo El Maderero
  +actions.logger.delete=Madereros De la Cancelaci\u00dbn
  +actions.requestfilter.create=Cree El Filtro Nuevo De la Petici\u00dbn
  +actions.requestfilter.delete=Filtros De la Petici\u00dbn De la Cancelaci\u00dbn
  +actions.userrealm.create=Cree El Nuevo Reino Del Utilizador
  +actions.userrealm.delete=Reinos Del Utilizador De la Cancelaci\u00dbn
  +actions.valve.create=Cree Nueva La V\u00b7lvula
  +actions.valve.delete=V\u00b7lvulas De la Cancelaci\u00dbn
  +actions.service.delete=Suprima este servicio
  
  
  
  1.3       +22 -9     
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java
  
  Index: SetUpServerAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetUpServerAction.java    2001/12/11 22:54:12     1.2
  +++ SetUpServerAction.java    2001/12/16 19:40:20     1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
 1.2 2001/12/11 22:54:12 patrickl Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/12/11 22:54:12 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServerAction.java,v
 1.3 2001/12/16 19:40:20 patrickl Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/12/16 19:40:20 $
    *
    * ====================================================================
    *
  @@ -90,12 +90,15 @@
   
   import javax.management.modelmbean.ModelMBean;
   import javax.management.modelmbean.ModelMBeanInfo;
  +
  +import org.apache.struts.util.MessageResources;
   /**
    * Test <code>Action</code> that handles events from the tree control test
    * page.
    *
    * @author Jazmin Jonson
  - * @version $Revision: 1.2 $ $Date: 2001/12/11 22:54:12 $
  + * @author Manveen Kaur
  + * @version $Revision: 1.3 $ $Date: 2001/12/16 19:40:20 $
    */
   
   public class SetUpServerAction extends Action {
  @@ -145,7 +148,9 @@
                   request.getSession().setAttribute(mapping.getAttribute(), form);
               
        }
  -
  +            
  +        MessageResources messages = getResources();
  +            
        // Do transaction stuff before this
   
        ServerForm serverFm = (ServerForm) form;
  @@ -169,10 +174,18 @@
   
               actionList = new ArrayList();
          // You can get this from the Mbean
  -            actionList.add(new LabelValueBean("Available Actions","Available 
Actions"));
  -            actionList.add(new LabelValueBean("Create New Service","Create New 
Service"));
  -            actionList.add(new LabelValueBean("Delete Services","Delete Services"));
  -     }
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.avaliable.actions"),
  +            "Available Actions"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.services.create"),
  +            "Create New Service"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.services.delete"),
  +            "Delete Services"));
  +        }
   
        Integer portNumb = null;
        Integer debug = null;
  
  
  
  1.2       +70 -36    
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java
  
  Index: SetUpServiceAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpServiceAction.java   2001/12/14 23:22:33     1.1
  +++ SetUpServiceAction.java   2001/12/16 19:40:20     1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
 1.1 2001/12/14 23:22:33 patrickl Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/12/14 23:22:33 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/SetUpServiceAction.java,v
 1.2 2001/12/16 19:40:20 patrickl Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/12/16 19:40:20 $
    *
    * ====================================================================
    *
  @@ -92,13 +92,14 @@
   import javax.management.modelmbean.ModelMBean;
   import javax.management.modelmbean.ModelMBeanInfo;
   
  +import org.apache.struts.util.MessageResources;
   
   /**
    * Test <code>Action</code> that handles events from the tree control test
    * page.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2001/12/14 23:22:33 $
  + * @version $Revision: 1.2 $ $Date: 2001/12/16 19:40:20 $
    */
   
   public class SetUpServiceAction extends Action {
  @@ -151,6 +152,8 @@
               
           }
           
  +        // The message resources for this package.
  +        MessageResources messages = getResources();
           
           String selectedName = request.getParameter("select");
           
  @@ -175,39 +178,70 @@
               
               actionList = new ArrayList();
               // You can get this from the Mbean
  -            actionList.add(new LabelValueBean("Available Actions",
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.avaliable.actions"),
               "Available Actions"));
  -            actionList.add(new LabelValueBean("Create New Access Logger...",
  -            "Create New Access Logger..."));
  -            actionList.add(new LabelValueBean("Delete Access Logger...",
  -            "Delete Access Logger..."));
  -            actionList.add(new LabelValueBean("Create New Connector...",
  -            "Create New Connector..."));
  -            actionList.add(new LabelValueBean("Delete Connectors...",
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.accesslogger.create"),
  +            "Create New Access Logger"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.accesslogger.delete"),
  +            "Delete Access Logger"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.connector.create"),
  +            "Create New Connector"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.connector.delete"),
               "Delete Connectors..."));
  -            actionList.add(new LabelValueBean("Create New Host...",
  -            "Create New Host..."));
  -            actionList.add(new LabelValueBean("Delete Hosts... ",
  -            "Delete Hosts... "));
  -            actionList.add(new LabelValueBean("Create New Logger...",
  -            "Create New Logger..."));
  -            actionList.add(new LabelValueBean("Delete Logger...",
  -            "Delete Logger..."));
  -            actionList.add(new LabelValueBean("Create New Request Filter...",
  -            "Create New Request Filter..."));
  -            actionList.add(new LabelValueBean("Delete Request Filters...",
  -            "Delete Request Filters..."));
  -            actionList.add(new LabelValueBean("Create New User Realm...",
  -            "Create New User Realm..."));
  -            actionList.add(new LabelValueBean("Delete User Realm...",
  -            "Delete User Realm..."));
  -            actionList.add(new LabelValueBean("Create New Valve...",
  -            "Create New Valve..."));
  -            actionList.add(new LabelValueBean("Delete Valves...",
  -            "Delete Valves..."));
  -            actionList.add(new LabelValueBean("Delete This Service...",
  -            "Delete This Service..."));
  -            // I18N these.
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.host.create"),
  +            "Create New Host"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.host.delete"),
  +            "Delete Hosts"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.logger.create"),
  +            "Create New Logger"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.logger.delete"),
  +            "Delete Logger"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.requestfilter.create"),
  +            "Create New Request Filter"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.requestfilter.delete"),
  +            "Delete Request Filters"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.userrealm.create"),
  +            "Create New User Realm"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.userrealm.delete"),
  +            "Delete User Realm"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.valve.create"),
  +            "Create New Valve"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.valve.delete"),
  +            "Delete Valves"));
  +            
  +            actionList.add(new LabelValueBean(
  +            messages.getMessage("actions.service.delete"),
  +            "Delete This Service"));
  +            
           }
           
           String serviceName = null;
  @@ -286,7 +320,7 @@
                   // the pulldown menu..
                   hostNameList.add(new LabelValueBean(hostName, hostName));
               }
  -
  +            
               
           }catch(Throwable t){
               t.printStackTrace(System.out);
  
  
  

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

Reply via email to