tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patri...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin ApplicationResources_en.properties ApplicationResources_es.properties TomcatTreeBuilder.java
Date Thu, 06 Dec 2001 22:57:54 GMT
patrickl    01/12/06 14:57:54

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
                        ApplicationResources_es.properties
                        TomcatTreeBuilder.java
  Log:
  Implementation of support for the Tomcat Server node in the admin webapp
  Submitted by:	Manveen Kaur
  
  Revision  Changes    Path
  1.5       +5 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApplicationResources_en.properties	2001/11/18 17:17:08	1.4
  +++ ApplicationResources_en.properties	2001/12/06 22:57:54	1.5
  @@ -8,6 +8,7 @@
   button.reset=Reset
   button.save=Save
   button.change=Change
  +button.cancel=Cancel
   login.enter=Enter a username and password to start a new session
   login.changeLanguage=Change the language
   index.success=Login successful!
  @@ -21,3 +22,7 @@
   sample.someText.required=<li>"Some Text" cannot be empty</li>
   sample.moreText.required=<li>"More Text" cannot be empty</li>
   save.success=Save sucessful!
  +server.heading=Tomcat Server
  +server.portnumber=Port Number
  +server.debuglevel=Debug Level
  +server.shutdown=Shutdown
  
  
  
  1.5       +5 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApplicationResources_es.properties	2001/11/18 17:17:08	1.4
  +++ ApplicationResources_es.properties	2001/12/06 22:57:54	1.5
  @@ -8,6 +8,7 @@
   button.reset=Reiniciar
   button.save=Guardar
   button.change=Cambiar
  +button.cancel=Cancelan
   login.enter=Introduzca un nombre de usuario y una contrase\u00f1a que empezar una sesi\u00f3n
nueva
   login.changeLanguage=Cambie el idioma
   index.success=\u00a1Autenticaci\u00f3n tiene \u00e9xito!
  @@ -21,3 +22,7 @@
   sample.someText.required=<li>\u00abAlg\u00fan Texto\u00bb no puede ser vac\u00edo</li>
   sample.moreText.required=<li>\u00abM\u00e1s Texto\u00bb no puede ser vac\u00edo</li>
   save.success=\u00a1Guardar tiene \u00e9xito!
  +server.heading=Tomcat Servidor
  +server.portnumber=Número de acceso
  +server.debuglevel=Ponga a punto Llano
  +server.shutdown=Parada normal
  
  
  
  1.2       +14 -12    jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java
  
  Index: TomcatTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TomcatTreeBuilder.java	2001/11/27 02:46:28	1.1
  +++ TomcatTreeBuilder.java	2001/12/06 22:57:54	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.1 2001/11/27 02:46:28 patrickl Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/11/27 02:46:28 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TomcatTreeBuilder.java,v
1.2 2001/12/06 22:57:54 patrickl Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/12/06 22:57:54 $
    *
    * ====================================================================
    *
  @@ -100,11 +100,11 @@
       // This SERVER_LABEL needs to be localized
       private final static String SERVER_LABEL = "Tomcat Server";
   
  -    private final static String SERVER_TYPE = "Catalina:type=Server";
  +    public final static String SERVER_TYPE = "Catalina:type=Server";
       private final static String SERVICE_TYPE = "Catalina:type=Service";
       private final static String ENGINE_TYPE = "Engine";
       private final static String CONNECTOR_TYPE = "Catalina:type=Connector";
  -    private final static String WILDCARD = ",*";
  +    public final static String WILDCARD = ",*";
   
       private static MBeanServer mBServer = null;
   
  @@ -135,15 +135,15 @@
           // HACK to take into account special characters like = and &
           // in the node name, could remove this code if encode URL
           // and later request.getParameter() could deal with = and &
  -        // character in parameter values. Must decode name in users action.
  -        // TreeControlTest.java in this case
  +        // character in parameter values. Decoding name not needed
  +        // because Tomcat does this automatically
    
   	String encodedServerName =  URLEncoder.encode(serverObjName);
           TreeControlNode serverNode =
               new TreeControlNode(serverObjName,
                                   "folder_16_pad.gif", SERVER_LABEL,
  -                                "treeControlTest.do?select=" + encodedServerName,
  -                                null, true);
  +                                "setUpServer.do?select=" + encodedServerName,
  +                                "content", true);
   
           return serverNode;
   
  @@ -168,8 +168,9 @@
               // HACK to take into account special characters like = and &
               // in the node name, could remove this code if encode URL
               // and later request.getParameter() could deal with = and &
  -            // character in parameter values. Must decode name in users action.
  -            // TreeControlTest.java in this case
  +            // character in parameter values. Decoding name not needed
  +            // because Tomcat does this automatically  
  +
               encodedServiceName =  URLEncoder.encode(service.getObjectName().toString());
   
               TreeControlNode serviceNode = 
  @@ -210,8 +211,9 @@
               // HACK to take into account special characters like = and &
               // in the node name, could remove this code if encode URL
               // and later request.getParameter() could deal with = and &
  -            // character in parameter values. Must decode name in users action.
  -            // TreeControlTest.java in this case
  +            // character in parameter values. Decoding name not needed
  +            // because Tomcat does this automatically 
  +
               encodedConnectorName =  URLEncoder.encode(connectorObj.getObjectName().toString());
   
               connectorNode = 
  
  
  

--
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