[exo-jcr-commits] exo-jcr SVN: r2900 - in jcr/branches/1.12.x/exo.jcr.component.ftp/src: main/resources/conf and 1 other directories.

Author: sergiykarpenko Date: 2010-08-09 06:52:59 -0400 (Mon, 09 Aug 2010) New Revision: 2900 Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml Log: EXOJCR-883: UTF-8 used instead of "win-1251" as client-side encoding in FTP service Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java 2010-08-09 09:55:05 UTC (rev 2899) +++ jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java 2010-08-09 10:52:59 UTC (rev 2900) @@ -1,57 +1,57 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.ftp.command; - -import org.exoplatform.services.ftp.FtpConst; - -import java.io.IOException; - -/** - * Created by The eXo Platform SAS Author : Vitaly Guly <gavrik-vetal(a)ukr.net/mail.ru&gt; - * - * @version $Id: $ - */ - -public class CmdStat extends FtpCommandImpl -{ - - public CmdStat() - { - commandName = FtpConst.Commands.CMD_STAT; - } - - public static final String[] eXoStatInfo = - {"211-", "", " _/_/_/ _/_/_/ _/_/_/ _/_/_/ _/_/_/ _/_/ _/_/_/", - " _/ _/ _/ _/ _/ _/ _/ _/ _/ ", - " _/_/ _/ _/_/_/ _/ _/ _/ _/_/ _/ ", - " _/ _/ _/ _/_/_/ _/ _/ _/ _/ ", - " ____________________________________________________________", " Connected from: [127.0.0.1]", - " Logged in as: [admin]", " TYPE: ASCII", " STRUcture: File", " MODE: Stream", " SYSTEM: Unix L8", - " CLIENT-SIDE-ENCODING: WINDOWS-1251", " ____________________________________ http://eXoPlatform.org";, "", - "211 -"}; - - public void run(String[] params) throws IOException - { - for (int i = 0; i < eXoStatInfo.length; i++) - { - reply(eXoStatInfo[i]); - } - } - -} +/* + * Copyright (C) 2009 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.exoplatform.services.ftp.command; + +import org.exoplatform.services.ftp.FtpConst; + +import java.io.IOException; + +/** + * Created by The eXo Platform SAS Author : Vitaly Guly <gavrik-vetal(a)ukr.net/mail.ru&gt; + * + * @version $Id: $ + */ + +public class CmdStat extends FtpCommandImpl +{ + + public CmdStat() + { + commandName = FtpConst.Commands.CMD_STAT; + } + + public static final String[] eXoStatInfo = + {"211-", "", " _/_/_/ _/_/_/ _/_/_/ _/_/_/ _/_/_/ _/_/ _/_/_/", + " _/ _/ _/ _/ _/ _/ _/ _/ _/ ", + " _/_/ _/ _/_/_/ _/ _/ _/ _/_/ _/ ", + " _/ _/ _/ _/_/_/ _/ _/ _/ _/ ", + " ____________________________________________________________", " Connected from: [127.0.0.1]", + " Logged in as: [admin]", " TYPE: ASCII", " STRUcture: File", " MODE: Stream", " SYSTEM: Unix L8", + " CLIENT-SIDE-ENCODING: UTF-8", " ____________________________________ http://eXoPlatform.org";, "", + "211 -"}; + + public void run(String[] params) throws IOException + { + for (int i = 0; i < eXoStatInfo.length; i++) + { + reply(eXoStatInfo[i]); + } + } + +} Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml 2010-08-09 09:55:05 UTC (rev 2899) +++ jcr/branches/1.12.x/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml 2010-08-09 10:52:59 UTC (rev 2900) @@ -43,7 +43,7 @@ </value-param> <value-param> <name>client-side-encoding</name> - <value>windows-1251</value> + <value>utf-8</value> <!-- <value>KOI8-R</value>--> </value-param> <value-param> @@ -79,25 +79,25 @@ <!-- <name>timeout</name>--> <!-- <value>60</value>--> <!-- </value-param>--> - - <!-- That is default configuration to mechanism "replace-forbidden-chars" - We will uncoment when we need changed default configuration. - --> - <!--value-param> - <name>replace-forbidden-chars</name> - <value>true</value> - </value-param> - - <value-param> - <name>forbidden-chars</name> - <value>:[]*'"|</value> - </value-param> - - <value-param> - <name>replace-char</name> - <value>_</value> - </value-param --> - + + <!-- That is default configuration to mechanism "replace-forbidden-chars" + We will uncoment when we need changed default configuration. + --> + <!--value-param> + <name>replace-forbidden-chars</name> + <value>true</value> + </value-param> + + <value-param> + <name>forbidden-chars</name> + <value>:[]*'"|</value> + </value-param> + + <value-param> + <name>replace-char</name> + <value>_</value> + </value-param --> + </init-params> </component> </configuration> \ No newline at end of file Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml 2010-08-09 09:55:05 UTC (rev 2899) +++ jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml 2010-08-09 10:52:59 UTC (rev 2900) @@ -1,89 +1,89 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <key>org.exoplatform.services.ftp.FtpServiceImpl</key> - <type>org.exoplatform.services.ftp.FtpServiceImpl</type> - <init-params> - <value-param> - <name>command-port</name> - <value>2122</value> - </value-param> - <value-param> - <name>data-min-port</name> - <value>52000</value> - </value-param> - <value-param> - <name>data-max-port</name> - <value>53000</value> - </value-param> - <value-param> - <name>system</name> - <!-- value>Windows_NT</value --> - <value>UNIX Type: L8</value> - </value-param> - <value-param> - <name>client-side-encoding</name> - <value>windows-1251</value> - <!-- value>KOI8-R</value --> - </value-param> - <value-param> - <name>def-folder-node-type</name> - <value>nt:folder</value> - </value-param> - <value-param> - <name>def-file-node-type</name> - <value>nt:file</value> - </value-param> - <value-param> - <name>def-file-mime-type</name> - <value>application/octet-stream</value> - </value-param> - <value-param> - <name>cache-folder-name</name> - <value>../../temp/ftp_cache</value> - </value-param> - - <!-- bytes per second --> - <!-- value-param> - <name>upload-speed-limit</name> - <value>20480</value> - </value-param --> - - <!-- bytes per second --> - <!-- value-param> - <name>download-speed-limit</name> - <value>20480</value> - </value-param --> - - <!-- seconds --> - <!-- value-param> - <name>timeout</name> - <value>60</value> - </value-param --> - </init-params> - </component> - -</configuration> +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.ftp.FtpServiceImpl</key> + <type>org.exoplatform.services.ftp.FtpServiceImpl</type> + <init-params> + <value-param> + <name>command-port</name> + <value>2122</value> + </value-param> + <value-param> + <name>data-min-port</name> + <value>52000</value> + </value-param> + <value-param> + <name>data-max-port</name> + <value>53000</value> + </value-param> + <value-param> + <name>system</name> + <!-- value>Windows_NT</value --> + <value>UNIX Type: L8</value> + </value-param> + <value-param> + <name>client-side-encoding</name> + <value>utf-8</value> + <!-- value>KOI8-R</value --> + </value-param> + <value-param> + <name>def-folder-node-type</name> + <value>nt:folder</value> + </value-param> + <value-param> + <name>def-file-node-type</name> + <value>nt:file</value> + </value-param> + <value-param> + <name>def-file-mime-type</name> + <value>application/octet-stream</value> + </value-param> + <value-param> + <name>cache-folder-name</name> + <value>../../temp/ftp_cache</value> + </value-param> + + <!-- bytes per second --> + <!-- value-param> + <name>upload-speed-limit</name> + <value>20480</value> + </value-param --> + + <!-- bytes per second --> + <!-- value-param> + <name>download-speed-limit</name> + <value>20480</value> + </value-param --> + + <!-- seconds --> + <!-- value-param> + <name>timeout</name> + <value>60</value> + </value-param --> + </init-params> + </component> + +</configuration> \ No newline at end of file Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml 2010-08-09 09:55:05 UTC (rev 2899) +++ jcr/branches/1.12.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml 2010-08-09 10:52:59 UTC (rev 2900) @@ -1,165 +1,165 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" - xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> - - <component> - <key>org.exoplatform.services.ftp.FtpServiceImpl</key> - <type>org.exoplatform.services.ftp.FtpServiceImpl</type> - <init-params> - <value-param> - <name>command-port</name> - <value>2122</value> - </value-param> - <value-param> - <name>data-min-port</name> - <value>52000</value> - </value-param> - <value-param> - <name>data-max-port</name> - <value>53000</value> - </value-param> - <value-param> - <name>system</name> - <!-- value>Windows_NT</value --> - <value>UNIX Type: L8</value> - </value-param> - <value-param> - <name>client-side-encoding</name> - <value>windows-1251</value> - <!-- value>KOI8-R</value --> - </value-param> - <value-param> - <name>def-folder-node-type</name> - <value>nt:folder</value> - </value-param> - <value-param> - <name>def-file-node-type</name> - <value>nt:file</value> - </value-param> - <value-param> - <name>def-file-mime-type</name> - <value>application/octet-stream</value> - </value-param> - <value-param> - <name>cache-folder-name</name> - <value>target/ftp_cache</value> - </value-param> - - <!-- bytes per second --> - <!-- value-param> - <name>upload-speed-limit</name> - <value>20480</value> - </value-param --> - - <!-- bytes per second --> - <!-- value-param> - <name>download-speed-limit</name> - <value>20480</value> - </value-param --> - - <!-- seconds --> - <!-- value-param> - <name>timeout</name> - <value>60</value> - </value-param --> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="dc" value="http://purl.org/dc/elements/1.1/" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/ext-nodetypes-config.xml</value> - </values-param> - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>test-jcr-config.xml</value> - </value-param> - </init-params> - </component> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> -</configuration> +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + + Copyright (C) 2009 eXo Platform SAS. + + This is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of + the License, or (at your option) any later version. + + This software is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this software; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301 USA, or see the FSF site: http://www.fsf.org. + +--> +<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.ftp.FtpServiceImpl</key> + <type>org.exoplatform.services.ftp.FtpServiceImpl</type> + <init-params> + <value-param> + <name>command-port</name> + <value>2122</value> + </value-param> + <value-param> + <name>data-min-port</name> + <value>52000</value> + </value-param> + <value-param> + <name>data-max-port</name> + <value>53000</value> + </value-param> + <value-param> + <name>system</name> + <!-- value>Windows_NT</value --> + <value>UNIX Type: L8</value> + </value-param> + <value-param> + <name>client-side-encoding</name> + <value>utf-8</value> + <!-- value>KOI8-R</value --> + </value-param> + <value-param> + <name>def-folder-node-type</name> + <value>nt:folder</value> + </value-param> + <value-param> + <name>def-file-node-type</name> + <value>nt:file</value> + </value-param> + <value-param> + <name>def-file-mime-type</name> + <value>application/octet-stream</value> + </value-param> + <value-param> + <name>cache-folder-name</name> + <value>target/ftp_cache</value> + </value-param> + + <!-- bytes per second --> + <!-- value-param> + <name>upload-speed-limit</name> + <value>20480</value> + </value-param --> + + <!-- bytes per second --> + <!-- value-param> + <name>download-speed-limit</name> + <value>20480</value> + </value-param --> + + <!-- seconds --> + <!-- value-param> + <name>timeout</name> + <value>60</value> + </value-param --> + </init-params> + </component> + + <component> + <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> + </component> + + <component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + <component-plugins> + <component-plugin> + <name>add.namespaces</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> + <init-params> + <properties-param> + <name>namespaces</name> + <property name="dc" value="http://purl.org/dc/elements/1.1/" /> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>add.nodeType</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> + <init-params> + <values-param> + <name>autoCreatedInNewRepository</name> + <description>Node types configuration file</description> + <value>jar:/conf/ext-nodetypes-config.xml</value> + </values-param> + </init-params> + </component-plugin> + </component-plugins> + </component> + + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>test-jcr-config.xml</value> + </value-param> + </init-params> + </component> + + <external-component-plugins> + <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.hsqldb.jdbcDriver" /> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal" /> + <property name="username" value="sa" /> + <property name="password" value="" /> + </properties-param> + </init-params> + </component-plugin> + </external-component-plugins> +</configuration> \ No newline at end of file