incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: incubator-ftpserver/src/java/org/apache/ftpserver/message FtpStatus_en.properties FtpStatus.properties
Date Thu, 22 Sep 2005 05:34:30 GMT
rana_b      2005/09/21 22:34:30

  Modified:    src/java/org/apache/ftpserver/command APPE.java DELE.java
                        EPRT.java
               src/doc/content/xdocs configuration.xml
               src/java/org/apache/ftpserver DirectoryLister.java
               src/bin  ftpd.bat ftpd.sh
               src/java/org/apache/ftpserver/message FtpStatus.properties
  Added:       src/java/org/apache/ftpserver/message
                        FtpStatus_en.properties
  Log:
  i18n support - submitted by Birkir A. Barkarson
  
  Revision  Changes    Path
  1.3       +4 -4      incubator-ftpserver/src/java/org/apache/ftpserver/command/APPE.java
  
  Index: APPE.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/command/APPE.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- APPE.java	9 Sep 2005 11:21:20 -0000	1.2
  +++ APPE.java	22 Sep 2005 05:34:30 -0000	1.3
  @@ -89,20 +89,20 @@
               catch(Exception ex) {
               }
               if(file == null) {
  -                out.send(550, "APPE.file.invalid", fileName);
  +                out.send(550, "APPE.invalid", fileName);
                   return;
               }
               fileName = file.getFullName();
               
               // check file existance
               if( !(file.doesExist() && file.isFile()) ) {
  -                out.send(550, "APPE.file.invalid", fileName);
  +                out.send(550, "APPE.invalid", fileName);
                   return;
               }
               
               // check permission
               if( !file.hasWritePermission()) {
  -                out.send(550, "APPE.no.permission", fileName);
  +                out.send(550, "APPE.permission", fileName);
                   return;
               }
               
  
  
  
  1.3       +3 -3      incubator-ftpserver/src/java/org/apache/ftpserver/command/DELE.java
  
  Index: DELE.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/command/DELE.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DELE.java	9 Sep 2005 11:21:20 -0000	1.2
  +++ DELE.java	22 Sep 2005 05:34:30 -0000	1.3
  @@ -76,11 +76,11 @@
           
           // check file
           if(!file.isFile()) {
  -            out.send(550, "DELE.file.invalid", fileName);
  +            out.send(550, "DELE.invalid", fileName);
               return;
           }
           if( !file.hasDeletePermission() ) {
  -            out.send(450, "DELE.no.permission", fileName);
  +            out.send(450, "DELE.permission", fileName);
               return;
           }
           
  
  
  
  1.2       +4 -4      incubator-ftpserver/src/java/org/apache/ftpserver/command/EPRT.java
  
  Index: EPRT.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/command/EPRT.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EPRT.java	7 Sep 2005 05:06:22 -0000	1.1
  +++ EPRT.java	22 Sep 2005 05:34:30 -0000	1.2
  @@ -81,7 +81,7 @@
               dataAddr = InetAddress.getByName(host);
           }
           catch(UnknownHostException ex) {
  -            out.send(553, "EPRT.host.unknown", null);
  +            out.send(553, "EPRT.host", null);
               return;
           }
           
  @@ -89,7 +89,7 @@
           if(handler.getConfig().getDataConnectionConfig().isPortIpCheck()) {
               InetAddress clientAddr = handler.getRequest().getRemoteAddress();
               if(!dataAddr.equals(clientAddr)) {
  -                out.send(510, "EPRT.IP.mismatch", null);
  +                out.send(510, "EPRT.mismatch", null);
                   return;
               }
           }
  @@ -100,7 +100,7 @@
               dataPort = Integer.parseInt(port);     
           }
           catch(NumberFormatException ex) {
  -            out.send(552, "EPRT.number.valid", null); 
  +            out.send(552, "EPRT.invalid", null); 
               return; 
           }
           
  
  
  
  1.3       +73 -65    incubator-ftpserver/src/doc/content/xdocs/configuration.xml
  
  Index: configuration.xml
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/doc/content/xdocs/configuration.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- configuration.xml	9 Sep 2005 11:16:01 -0000	1.2
  +++ configuration.xml	22 Sep 2005 05:34:30 -0000	1.3
  @@ -16,25 +16,25 @@
     limitations under the License.
   -->
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
  -<document> 
  -    <header> 
  -        <title>Apache FTP Server - Configuration</title> 
  +<document>
  +    <header>
  +        <title>Apache FTP Server - Configuration</title>
           <authors>
               <person id="RB" name="Rana Bhattacharyya" email="rana_b@yahoo.com"/>
           </authors>
  -    </header> 
  -  <body> 
  +    </header>
  +  <body>
         <section id="overview">
             <title>Overview</title>
  -          <p>This document explains the Apache FTP Server configuration parameters.

  +          <p>This document explains the Apache FTP Server configuration parameters.
                All the configuration parameters are grouped depending on the component
  -             where it has been used. This configuration format is very much open to 
  -             suite the user requirements. The server comes with two different 
  +             where it has been used. This configuration format is very much open to
  +             suite the user requirements. The server comes with two different
                configuration implementations - properties file based and XML file based
  -             configurations (./res/ftpd.properties and ./res/ftpd.xml). You can have 
  -             your own Configuration implementation. You just need to implement 
  -             <em>org.apache.ftpserver.ftplet.Configuration</em> interface.
Most of the 
  -             configuration parameters have default values. So you do not have to 
  +             configurations (./res/ftpd.properties and ./res/ftpd.xml). You can have
  +             your own Configuration implementation. You just need to implement
  +             <em>org.apache.ftpserver.ftplet.Configuration</em> interface.
Most of the
  +             configuration parameters have default values. So you do not have to
                specify all the configuration parameters.
             </p>
             <p>The configuration parameters follow a tree hierarchy.</p>
  @@ -47,7 +47,7 @@
                  |
                  |--- n4
             </source>
  -          <p>Only the leaf nodes can have configuration values. That is in the above

  +          <p>Only the leaf nodes can have configuration values. That is in the above
                hierarchy only n3 and n4 can have values. If we assume that the value of
                n3 is v3 and the value of n4 is v4.
             </p>
  @@ -65,7 +65,7 @@
                 </n2>
             <n1>
             ]]></source>
  -          <p>We shall use &quot;.&quot; as the configuration path separator.
That 
  +          <p>We shall use &quot;.&quot; as the configuration path separator.
That
                is we shall use <em>n1.n2.n3</em> and <em>n1.n2.n4</em>
to identify
                <em>n3</em> and <em>n4</em> configuration parameters.
             </p>
  @@ -135,7 +135,9 @@
     |       |
     |       |---- <b>class</b> (org.apache.ftpserver.message.MessageResourceImpl)
     |       |
  -  |       |---- <b>custom-message-file</b> (./res/messages.gen)
  +  |       |---- <b>custom-message-dir</b> (./res)
  +  |       |
  +  |       |---- <b>languages</b> (&lt;none&gt;)
     |
     |---- connection-manager
     |       |
  @@ -150,7 +152,7 @@
     |       |---- <b>default-idle-time</b> (60)
     |       |
     |       |---- <b>timeout-poll-inverval</b> (60)
  -  |       
  +  |
     |---- logger
     |       |
     |       |---- <b>class</b> (org.apache.ftpserver.logger.FileLogger)
  @@ -229,7 +231,7 @@
                      |---- <b><i>param</i></b>
             </source>
         </section>
  -      
  +
         <section id="configuration_parameters">
             <title>Configuration Parameters</title>
             <table>
  @@ -288,7 +290,7 @@
                 </tr>
                 <tr>
                     <td>config.data-connection.pasv-port</td>
  -                  <td>Allowed passive ports (comma separated). 
  +                  <td>Allowed passive ports (comma separated).
                         0 means any free port. The default is 0.</td>
                 </tr>
                 <tr>
  @@ -329,7 +331,7 @@
                 </tr>
                 <tr>
                     <td>config.create-default-user</td>
  -                  <td>Flag to indicate whether the standard users 
  +                  <td>Flag to indicate whether the standard users
                         (admin and anonymous) will be created by default if not found. The
                         admin user password will be same as admin user name.
                         The default is true.
  @@ -340,9 +342,15 @@
                     <td>org.apache.ftpserver.message.MessageResourceImpl</td>
                 </tr>
                 <tr>
  -                  <td>config.message.custom-message-file</td>
  -                  <td>The file where user defined custom FTP server replies will
be 
  -                      stored. The default value is ./res/messages.gen
  +                  <td>config.message.custom-message-dir</td>
  +                  <td>The directory where user defined custom FTP server replies
will be
  +                      stored. The default value is ./res
  +                  </td>
  +              </tr>
  +              <tr>
  +                  <td>config.message.languages</td>
  +                  <td>Comma separated values of all the languages supported.
  +                      The default value is null.
                     </td>
                 </tr>
                 <tr>
  @@ -359,28 +367,28 @@
                 </tr>
                 <tr>
                     <td>config.connection-service.anonymous-login-enabled</td>
  -                  <td>Flag to indicate annonymous login support. By default the server

  +                  <td>Flag to indicate annonymous login support. By default the server
                         allows anonymous connections. That is the default value is true.
                     </td>
                 </tr>
                 <tr>
                     <td>config.connection-service.max-anonymous-login</td>
                     <td>Maximum anonymous simultaneous logins (0 means no limit).
  -                      Should be less than or equal to the maximum number of simultaneous

  -                      logins. It will not be used if the sever does not allow anonymous

  +                      Should be less than or equal to the maximum number of simultaneous
  +                      logins. It will not be used if the sever does not allow anonymous
                         login. The default value is 10.
                     </td>
                 </tr>
                 <tr>
                     <td>config.connection-service.default-idle-time</td>
  -                  <td>Default idle time in seconds. It is used to close idle 
  -                      data connection and non-logged-in connections. The default value

  +                  <td>Default idle time in seconds. It is used to close idle
  +                      data connection and non-logged-in connections. The default value
                         is 60.
                     </td>
                 </tr>
                 <tr>
                     <td>config.connection-service.timeout-poll-interval</td>
  -                  <td>Polling interval in seconds to disconnect idle users. The default

  +                  <td>Polling interval in seconds to disconnect idle users. The default
                         value is 60.
                     </td>
                 </tr>
  @@ -412,7 +420,7 @@
                     <td>config.logger.dir</td>
                     <td>The directory where log files will be stored. The default is
./res/log</td>
                 </tr>
  -              
  +
                 <tr>
                     <td>config.logger.max-file-size</td>
                     <td>Log file maximum size (0 means no limit) in kbytes. The default
is 0.</td>
  @@ -427,7 +435,7 @@
                 </tr>
                 <tr>
                     <td>config.ip-restrictor.file</td>
  -                  <td>The file where IP restriction information will be stored. 
  +                  <td>The file where IP restriction information will be stored.
                         The default is ./res/ip.gen
                     </td>
                 </tr>
  @@ -443,11 +451,11 @@
                 </tr>
                 <tr>
                     <td>config.user-manager.admin</td>
  -                  <td>FTP server administrator name. It is used in properties, database

  +                  <td>FTP server administrator name. It is used in properties, database
                         and LDAP based user managers. The default value is admin.
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.prop-file</td>
                     <td>The properies file location - used in properties file based
user manager.
                         The default value is ./res/user.gen
  @@ -471,77 +479,77 @@
                     <td>config.user-manager.jdbc-user</td>
                     <td>Database user used in database based user manager. The default
value is null.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.jdbc-password</td>
                     <td>Database password - used in database based user manager. The
default is null.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-insert</td>
                     <td>SQL INSERT statement used to add a new user. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source><![CDATA[
  -    INSERT INTO FTP_USER 
  -        (uid, userpassword, 
  -         homedirectory, enableflag, 
  -         writepermission, idletime, 
  -         uploadrate, downloadrate) 
  -    VALUES ('{uid}', '{userpassword}', 
  -            '{homedirectory}', 
  -            '{enableflag}', 
  -            '{writepermission}', {idletime}, 
  +    INSERT INTO FTP_USER
  +        (uid, userpassword,
  +         homedirectory, enableflag,
  +         writepermission, idletime,
  +         uploadrate, downloadrate)
  +    VALUES ('{uid}', '{userpassword}',
  +            '{homedirectory}',
  +            '{enableflag}',
  +            '{writepermission}', {idletime},
               {uploadrate}, {downloadrate})
      ]]></source>
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-update</td>
                     <td>SQL UPDATE statement used to update an existing user. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source><![CDATA[
  -    UPDATE FTP_USER SET 
  +    UPDATE FTP_USER SET
           userpassword='{userpassword}',homedirectory='{homedirectory}',
           enableflag='{enableflag}',writepermission='{writepermission}',
           idletime={idletime},uploadrate={uploadrate},
  -        downloadrate={downloadrate} 
  +        downloadrate={downloadrate}
       WHERE uid='{uid}'
       ]]></source>
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-delete</td>
                     <td>SQL DELETE statement used to delete an existing user. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source>DELETE FROM FTP_USER WHERE uid = '{uid}'</source>
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-select</td>
                     <td>SQL SELECT statement used to select an existing user. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source><![CDATA[
  -    SELECT uid, userpassword, homedirectory, 
  -           enableflag, writepermission, 
  -           idletime, uploadrate, 
  -           downloadrate 
  -    FROM FTP_USER 
  +    SELECT uid, userpassword, homedirectory,
  +           enableflag, writepermission,
  +           idletime, uploadrate,
  +           downloadrate
  +    FROM FTP_USER
       WHERE uid = '{uid}'
       ]]></source>
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-all</td>
                     <td>SQL SELECT statement used to select all user ids. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source>SELECT uid FROM FTP_USER ORDER BY uid</source>
                     </td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.sql-user-authenticate</td>
                     <td>SQL SELECT statement used to authenticate user. All the
                         dynamic values will be replaced during runtime. Sample query:
                         <source><![CDATA[
  -    SELECT uid 
  -    FROM FTP_USER 
  +    SELECT uid
  +    FROM FTP_USER
       WHERE uid='{uid}' AND userpassword='{userpassword}'
       ]]></source>
                     </td>
  @@ -554,35 +562,35 @@
                     <td>config.user-manager.ldap-admin-dn</td>
                     <td>LDAP administrator (eg. cn=Directory Manager)</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.ldap-admin-password</td>
                     <td>LDAP administrator password</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.ldap-authentication</td>
                     <td>LDAP server authentication type. The default value is simple.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.user-manager.ldap-user-base-dn</td>
                     <td>LDAP server root where all users are stored (eg. ou=people,o=yoursite.com).</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.file-system-manager.class</td>
                     <td>File system manager implementation class - org.apache.ftpserver.filesystem.NativeFileSystemManager</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.file-system-manager.create-home</td>
                     <td>Flag to indicate whether user home directory will be created
if not exists.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.ftplets</td>
                     <td>Comma separated ftplet names.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.ftplet.<i>name</i>.class</td>
                     <td>For each ftplet there must be one configuration parameter.
This is ftplet implementation class.</td>
                 </tr>
  -              <tr>   
  +              <tr>
                     <td>config.ftplet.<i>name.param</i></td>
                     <td>Each ftplet can have its own configuration parameters.</td>
                 </tr>
  
  
  
  1.3       +20 -23    incubator-ftpserver/src/java/org/apache/ftpserver/DirectoryLister.java
  
  Index: DirectoryLister.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/DirectoryLister.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DirectoryLister.java	9 Sep 2005 11:19:47 -0000	1.2
  +++ DirectoryLister.java	22 Sep 2005 05:34:30 -0000	1.3
  @@ -70,43 +70,40 @@
       /**
        * Get selected types.
        */
  -    public String getSelectedTypes() {
  -        StringBuffer sb = new StringBuffer(64);
  -        for(int i=0; i<m_selectedTypes.length; ++i) {
  -            if(i != 0) {
  -                sb.append(';');
  -            }
  -            sb.append(m_selectedTypes[i]);
  -        }
  -        return sb.toString();
  +    public String[] getSelectedTypes() {
  +        String types[] = new String[m_selectedTypes.length];
  +        System.arraycopy(m_selectedTypes, 0, types, 0, m_selectedTypes.length);
  +        return types;
       }
       
       /**
        * Returns true if, and only if, the string passed was
        * successfully parsed as valid types.
        */
  -    public boolean setSelectedTypes(String types) {
  -        StringTokenizer st = new StringTokenizer(types, ";");
  -        String[] vaildTokens = new String[st.countTokens()];
  -        
  -        // compare each selected types
  -        int i = 0;
  -        while(st.hasMoreTokens()) {
  +    public boolean setSelectedTypes(String types[]) {
  +        
  +        // ignore null types
  +        if(types == null) {
  +            return false;
  +        }
  +        
  +        // check all the types
  +        for(int i=0; i<types.length; ++i) {
               boolean bMatch = false;
  -            String token = st.nextToken();
               for(int j=0; j<AVAILABLE_TYPES.length; ++j) {
  -                if(AVAILABLE_TYPES[j].equalsIgnoreCase(token)) {
  -                    vaildTokens[i++] = AVAILABLE_TYPES[j];
  -                    bMatch=true;
  +                if(AVAILABLE_TYPES[j].equals(types[i])) {
  +                    bMatch = true;
                       break;
  -                 }
  +                }
               }
               if(!bMatch) {
                   return false;
               }
           }
           
  -        m_selectedTypes = vaildTokens;
  +        // set the user types
  +        m_selectedTypes = new String[types.length];
  +        System.arraycopy(types, 0, m_selectedTypes, 0, types.length);
           return true;
       }
       
  
  
  
  1.2       +1 -1      incubator-ftpserver/src/bin/ftpd.bat
  
  Index: ftpd.bat
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/bin/ftpd.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ftpd.bat	7 Sep 2005 05:11:09 -0000	1.1
  +++ ftpd.bat	22 Sep 2005 05:34:30 -0000	1.2
  @@ -1,3 +1,3 @@
   @echo off
   REM CUSTOM_CLASSPATH=
  -%JAVA_HOME%\bin\java -classpath .\lib\ftpserver.jar;%CUSTOM_CLASSPATH% org.apache.ftpserver.FtpServer
%*
  \ No newline at end of file
  +%JAVA_HOME%\bin\java -classpath .\lib\ftpserver.jar;%CUSTOM_CLASSPATH% org.apache.ftpserver.FtpServer
%*
  
  
  
  1.2       +1 -1      incubator-ftpserver/src/bin/ftpd.sh
  
  Index: ftpd.sh
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/bin/ftpd.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ftpd.sh	7 Sep 2005 05:11:09 -0000	1.1
  +++ ftpd.sh	22 Sep 2005 05:34:30 -0000	1.2
  @@ -1,3 +1,3 @@
   #!/bin/sh
   #CUSTOM_CLASSPATH=
  -$JAVA_HOME/bin/java -classpath ./lib/ftpserver.jar:$CUSTOM_CLASSPATH org.apache.ftpserver.FtpServer
$*
  \ No newline at end of file
  +$JAVA_HOME/bin/java -classpath ./lib/ftpserver.jar:$CUSTOM_CLASSPATH org.apache.ftpserver.FtpServer
$*
  
  
  
  1.3       +74 -73    incubator-ftpserver/src/java/org/apache/ftpserver/message/FtpStatus.properties
  
  Index: FtpStatus.properties
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/message/FtpStatus.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FtpStatus.properties	9 Sep 2005 11:19:47 -0000	1.2
  +++ FtpStatus.properties	22 Sep 2005 05:34:30 -0000	1.3
  @@ -1,19 +1,19 @@
   # Ftp server status properties
   550=Requested action not taken.
   
  -502.not.implemented=Command not implemented.
  -530.permission.denied=Access denied.
  +502.not.implemented=Command {request.cmd} not implemented.
  +530.permission=Access denied.
   530.ip.restricted=No server access from the IP {client.ip}.
   530.connection.limit=Maximum server connection has been reached.
  -220.connection.welcome=Service ready for new user.
  +220=Service ready for new user.
   
   226.ABOR=ABOR command successful.
   
   202.ACCT=Command ACCT not implemented, superfluous at this site.
   
   501.APPE=Syntax error in parameters or arguments.
  -550.APPE.file.invalid={output.msg}: Not a plain file.
  -550.APPE.no.permission={output.msg}: Permission denied.
  +550.APPE.invalid={output.msg}\: Not a plain file.
  +550.APPE.permission={output.msg}\: Permission denied.
   150.APPE=File status okay; about to open data connection.
   425.APPE=Can't open data connection.
   426.APPE=Data connection error.
  @@ -32,56 +32,57 @@
   550.CWD=No such directory.
   
   501.DELE=Syntax error in parameters or arguments.
  -550.DELE.file.invalid=Not a valid file \"{output.msg}\".
  -450.DELE.no.permission=No permission to delete {output.msg}.
  +550.DELE.invalid=Not a valid file \"{output.msg}\".
  +450.DELE.permission=No permission to delete {output.msg}.
   250.DELE=Requested file action okay, deleted {output.msg}.
   450.DELE=Can't delete file {output.msg}.
   
   501.EPRT=Syntax error in parameters or arguments.
   510.EPRT=Syntax error in parameters.
   510.EPRT.disabled=EPRT is disabled.
  -510.EPRT.IP.mismatch=EPRT IP is not same as {client.ip}.
  -553.EPRT.host.unknown=Host unknown.
  -552.EPRT.number.invalid=Not a valid port number.
  +510.EPRT.mismatch=EPRT IP is not same as {client.ip}.
  +553.EPRT.host=Host unknown.
  +552.EPRT.invalid=Not a valid port number.
   200.EPRT=Command EPRT okay.
   
   425.EPSV=Can't open passive connection.
   229.EPSV=Entering Passive Mode ({output.msg})
   
  -211.FEAT=Extensions supported\nSIZE\nMDTM\nREST STREAM\nMLST Size;Modify;Type;Perm\nAUTH
SSL\nMODE Z\nUTF8\nEnd
  +211.FEAT=Extensions supported\nSIZE\nMDTM\nREST STREAM\nLANG en;zh-tw\nMLST Size;Modify;Type;Perm\nAUTH
SSL\nMODE Z\nUTF8\nTVFS\nEnd
   
   214=The following commands are implemented.\nABOR  APPE  CDUP  CWD   DELE  HELP  LIST 
MDTM\nMKD   MODE  NLST  NOOP  PASS  PASV  PORT  PWD\nQUIT  REST  RETR  RMD   RNFR  RNTO  SITE
 SIZE\nSTAT  STOR  STOU  STRU  SYST  TYPE  USER\nEnd of help.
  -214.ABOR=Syntax: ABOR
  -214.APPE=Syntax: APPE <sp> <pathname>
  -214.CDUP=Syntax: CDUP
  -214.CWD=Syntax: CWD <sp> <pathname>
  -214.DELE=Syntax: DELE <sp> <pathname>
  -214.EPRT=Syntax: EPRT<space><d><net-prt><d><net-addr><d><tcp-port><d>
  -214.HELP=Syntax: HELP [<sp> <string>]
  -214.LIST=Syntax: LIST [<sp> <pathname>]
  -214.MDTM=Syntax: MDTM <sp> <pathname>
  -214.MKD=Syntax: MKD <sp> <pathname>
  -214.MODE=Syntax: MODE <sp> <mode-code>
  -214.NLST=Syntax: NLST [<sp> <pathname>]
  -214.NOOP=Syntax: NOOP
  -214.PASS=Syntax: PASS <sp> <password>
  -214.PASV=Syntax: PASV
  -214.PORT=Syntax: PORT <sp> <host-port>
  -214.PWD=Syntax: PWD
  -214.QUIT=Syntax: QUIT
  -214.REST=Syntax: RETR <sp> <marker>
  -214.RETR=Syntax: RETR <sp> <pathname>
  -214.RMD=Syntax: RMD <sp> <pathname>
  -214.RNFR=Syntax: RNFR <sp> <pathname>
  -214.RNTO=Syntax: RNTO <sp> <pathname>
  -214.SITE=Syntax: SITE <sp> <string>    
  -214.STOR=Syntax: STOR <sp> <pathname>
  -214.STOU=Syntax: STOU
  -214.SYST=Syntax: SYST
  -214.TYPE=Syntax: TYPE <sp> <type-code>
  -214.USER=Syntax: USER <sp> <username>
  +214.ABOR=Syntax\: ABOR
  +214.APPE=Syntax\: APPE <sp> <pathname>
  +214.CDUP=Syntax\: CDUP
  +214.CWD=Syntax\: CWD <sp> <pathname>
  +214.DELE=Syntax\: DELE <sp> <pathname>
  +214.EPRT=Syntax\: EPRT<space><d><net-prt><d><net-addr><d><tcp-port><d>
  +214.HELP=Syntax\: HELP [<sp> <string>]
  +214.LIST=Syntax\: LIST [<sp> <pathname>]
  +214.MDTM=Syntax\: MDTM <sp> <pathname>
  +214.MKD=Syntax\: MKD <sp> <pathname>
  +214.MODE=Syntax\: MODE <sp> <mode-code>
  +214.NLST=Syntax\: NLST [<sp> <pathname>]
  +214.NOOP=Syntax\: NOOP
  +214.PASS=Syntax\: PASS <sp> <password>
  +214.PASV=Syntax\: PASV
  +214.PORT=Syntax\: PORT <sp> <host-port>
  +214.PWD=Syntax\: PWD
  +214.QUIT=Syntax\: QUIT
  +214.REST=Syntax\: RETR <sp> <marker>
  +214.RETR=Syntax\: RETR <sp> <pathname>
  +214.RMD=Syntax\: RMD <sp> <pathname>
  +214.RNFR=Syntax\: RNFR <sp> <pathname>
  +214.RNTO=Syntax\: RNTO <sp> <pathname>
  +214.SITE=Syntax\: SITE <sp> <string>    
  +214.STOR=Syntax\: STOR <sp> <pathname>
  +214.STOU=Syntax\: STOU
  +214.SYST=Syntax\: SYST
  +214.TYPE=Syntax\: TYPE <sp> <type-code>
  +214.USER=Syntax\: USER <sp> <username>
   
  -502.LANG=Command not implemented.
  +504.LANG=Command LANG not implemented for this parameter.
  +200.LANG=Command LANG okay.
   
   150.LIST=File status okay; about to open data connection.
   425.LIST=Can't open data connection.
  @@ -95,12 +96,12 @@
   550.MDTM=File {output.msg} unavailable.
   
   501.MLST=Not a valid pathname.
  -250.MLST=\n {output.msg}\nRequested file action okay, completed.
  +250.MLST=\n{output.msg}\nRequested file action okay, completed.
   
   501.MKD=Syntax error in parameters or arguments.
  -550.MKD.invalid.file={output.msg}\: not a valid file.
  +550.MKD.invalid={output.msg}\: not a valid file.
   550.MKD.exists={output.msg}\: already exists.
  -550.MKD.no.permission=No permission to create {output.msg}.
  +550.MKD.permission=No permission to create {output.msg}.
   250.MKD=\"{output.msg}\" created.
   550.MKD=Can't create directory {output.msg}.
   
  @@ -135,8 +136,8 @@
   501.PASS=Syntax error in parameters or arguments.
   503.PASS=Login with USER first.
   202.PASS=Already logged-in.
  -421.PASS.anonymous.limit=Maximum anonymous login limit has been reached.
  -421.PASS.login.limit=Maximum login limit has been reached.
  +421.PASS.anonymous=Maximum anonymous login limit has been reached.
  +421.PASS.login=Maximum login limit has been reached.
   530.PASS=Authentication failed.
   230.PASS=User logged in, proceed.
   
  @@ -148,9 +149,9 @@
   501.PORT=Syntax error in parameters or arguments.
   510.PORT=Syntax error in parameters.
   510.PORT.disabled=PORT is disabled.
  -510.PORT.IP.mismatch=PORT IP is not same as {client.ip}.
  -553.PORT.host.unknown=Host unknown.
  -552.PORT.number.invalid=Not a valid port number.
  +510.PORT.mismatch=PORT IP is not same as {client.ip}.
  +553.PORT.host=Host unknown.
  +552.PORT.invalid=Not a valid port number.
   200.PORT=Command PORT okay.
   
   501.PROT=Syntax error in parameters or arguments.
  @@ -165,35 +166,35 @@
   220.REIN=Service ready for new user.
   
   501.REST=Syntax error in parameters or arguments.
  -501.REST.number.invalid=Not a valid marker.
  -501.REST.number.negetive=Marker can't be negetive.
  +501.REST.invalid=Not a valid marker.
  +501.REST.negetive=Marker can't be negetive.
   350.REST=Restarting at {request.arg}. Send STORE or RETRIEVE to initiate transfer.
   
   501.RETR=Syntax error in parameters or arguments.
  -550.RETR.file.not.exist={output.msg}: No such file or directory.
  -550.RETR.file.invalid={output.msg}: Not a plain file.
  -550.RETR.no.permission={output.msg}: Permission denied.
  +550.RETR.missing={output.msg}\: No such file or directory.
  +550.RETR.invalid={output.msg}\: Not a plain file.
  +550.RETR.permission={output.msg}: Permission denied.
   150.RETR=File status okay; about to open data connection.
   425.RETR=Can't open data connection.
   426.RETR=Data connection error.
  -551.RETR={output.msg}: Error on input file.
  +551.RETR={output.msg}\: Error on input file.
   226.RETR=Transfer complete.
   
   501.RMD=Syntax error in parameters or arguments.
  -550.RMD.no.permission=No permission to create {output.msg}.
  -550.RMD.directory.invalid=Not a valid directory \"{output.msg}\".
  +550.RMD.permission=No permission to create {output.msg}.
  +550.RMD.invalid=Not a valid directory \"{output.msg}\".
   250.RMD=\"{output.msg}\" removed.
   550.RMD=Can't remove directory {output.msg}.
   
   501.RNFR=Syntax error in parameters or arguments.
  -550.RNFR={output.msg}: File unavailable.
  +550.RNFR={output.msg}\: File unavailable.
   350.RNFR=Requested file action pending further information.
   
   501.RNTO=Syntax error in parameters or arguments.
   503.RNTO=Can't find the file which has to be renamed.
  -553.RNTO.no.permission=No permission to rename.
  -553.RNTO.not.valid=Not a valid file name.
  -553.RNTO.file.not.exist={output.msg}: No such file or directory.
  +553.RNTO.permission=No permission to rename.
  +553.RNTO.invalid=Not a valid file name.
  +553.RNTO.missing={output.msg}\: No such file or directory.
   250.RNTO=Requested file action okay, file renamed.
   553.RNTO=Can't rename file.
   
  @@ -201,28 +202,28 @@
   502.SITE=Command SITE not implemented for {output.msg}.
   500.SITE=Execution failed.
   530.SITE=Access denied.
  -200.SITE.HELP=\nDESCUSER \: display user information.\nHELP     \: display this message.\nSTAT
    \: show statistics.\nWHO      \: display all connected users.\nZONE     \: display timezone.\nEnd
of help.
  +200.SITE.HELP=SITE Commands\nDESCUSER \: display user information.\nHELP     \: display
this message.\nSTAT     \: show statistics.\nWHO      \: display all connected users.\nZONE
    \: display timezone.\nEnd.
   503.SITE.DESCUSER=Can't find the user name.
  -501.SITE.DESCUSER.not.exist={output.msg} \: User not found. 
  +501.SITE.DESCUSER={output.msg} \: User not found. 
   
   501.SIZE=Syntax error in parameters or arguments.
  -550.SIZE.file.not.exist={output.msg}: No such file or directory.
  -550.SIZE.file.invalid={output.msg}: Not a plain file.
  +550.SIZE.missing={output.msg}\: No such file or directory.
  +550.SIZE.invalid={output.msg}\: Not a plain file.
   213.SIZE={output.msg}
   
   211.STAT=Apache FTP Server\nConnected to {server.ip}\nConnected from {client.ip}\nLogged
in as {client.login}\nEnd of status.
   
   501.STOR=Syntax error in parameters or arguments.
  -550.STOR.path.invalid={output.msg}: Invalid path.
  -550.STOR.no.permission={output.msg}: Permission denied.
  +550.STOR.invalid={output.msg}\: Invalid path.
  +550.STOR.permission={output.msg}\: Permission denied.
   150.STOR=File status okay; about to open data connection.
   425.STOR=Can't open data connection.
   426.STOR=Data connection error.
  -551.STOR={output.msg}: Error on output file.
  +551.STOR={output.msg}\: Error on output file.
   226.STOR=Transfer complete.
   
   550.STOU=Unique file name error.
  -550.STOU.no.permission=Permission denied.
  +550.STOU.permission=Permission denied.
   150.STOU=File status okay; about to open data connection.
   425.STOU=Can't open data connection.
   250.STOU={output.msg}\: Transfer started.
  @@ -242,9 +243,9 @@
   
   501.USER=Syntax error in parameters or arguments.
   230.USER=Already logged-in.
  -530.USER.user.invalid=Invalid user name.
  -530.USER.no.anonymous.support=Anonymous connection is not allowed.
  -421.USER.anonymous.limit=Maximum anonymous login limit has been reached.
  -421.USER.login.limit=Maximum login limit has been reached.
  +530.USER.invalid=Invalid user name.
  +530.USER.anonymous=Anonymous connection is not allowed.
  +421.USER.anonymous=Maximum anonymous login limit has been reached.
  +421.USER.login=Maximum login limit has been reached.
   331.USER.anonymous=Guest login okay, send your complete e-mail address as password.
   331.USER=User name okay, need password for {client.login.name}.
  
  
  
  1.1                  incubator-ftpserver/src/java/org/apache/ftpserver/message/FtpStatus_en.properties
  
  Index: FtpStatus_en.properties
  ===================================================================
  # English messages
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message