exo-jcr SVN: r2902 - in jcr/trunk/exo.jcr.component.ftp/src: main/resources/conf and 1 other directories.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-09 07:46:24 -0400 (Mon, 09 Aug 2010)
New Revision: 2902
Modified:
jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java
jcr/trunk/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml
jcr/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml
jcr/trunk/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/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java 2010-08-09 11:01:05 UTC (rev 2901)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/java/org/exoplatform/services/ftp/command/CmdStat.java 2010-08-09 11:46:24 UTC (rev 2902)
@@ -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>
- *
- * @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>
+ *
+ * @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/trunk/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml 2010-08-09 11:01:05 UTC (rev 2901)
+++ jcr/trunk/exo.jcr.component.ftp/src/main/resources/conf/jcr-ftp-configuration.xml 2010-08-09 11:46:24 UTC (rev 2902)
@@ -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/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml 2010-08-09 11:01:05 UTC (rev 2901)
+++ jcr/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/ftp-service-configuration.xml 2010-08-09 11:46:24 UTC (rev 2902)
@@ -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/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml 2010-08-09 11:01:05 UTC (rev 2901)
+++ jcr/trunk/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-configuration.xml 2010-08-09 11:46:24 UTC (rev 2902)
@@ -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
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2901 - jcr/branches/1.12.x/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-09 07:01:05 -0400 (Mon, 09 Aug 2010)
New Revision: 2901
Modified:
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java
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.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java 2010-08-09 10:52:59 UTC (rev 2900)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/src/main/java/org/exoplatform/frameworks/ftpclient/commands/CmdList.java 2010-08-09 11:01:05 UTC (rev 2901)
@@ -1,132 +1,132 @@
-/*
- * 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.frameworks.ftpclient.commands;
-
-import org.exoplatform.frameworks.ftpclient.FtpConst;
-import org.exoplatform.frameworks.ftpclient.data.FtpDataTransiver;
-import org.exoplatform.frameworks.ftpclient.data.FtpFileInfo;
-import org.exoplatform.frameworks.ftpclient.data.FtpFileInfoImpl;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
-import java.util.ArrayList;
-
-/**
- * Created by The eXo Platform SAS .
- *
- * @author Vitaly Guly
- * @version $Id: $
- */
-
-public class CmdList extends FtpCommandImpl
-{
-
- private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdList");
-
- protected String path = "";
-
- protected byte[] fileData;
-
- protected ArrayList<FtpFileInfo> files = new ArrayList<FtpFileInfo>();
-
- public CmdList()
- {
- }
-
- public CmdList(String path)
- {
- this.path = path;
- }
-
- public byte[] getFileData()
- {
- return fileData;
- }
-
- public ArrayList<FtpFileInfo> getFiles()
- {
- return files;
- }
-
- public int execute()
- {
- try
- {
- if (clientSession.getSystemType() == null)
- {
- clientSession.executeCommand(new CmdSyst());
- }
-
- String req;
-
- if ("".equals(path))
- {
- req = FtpConst.Commands.CMD_LIST;
- }
- else
- {
- req = String.format("%s %s", FtpConst.Commands.CMD_LIST, path);
- }
- sendCommand(req);
-
- int reply = getReply();
-
- if (reply == FtpConst.Replyes.REPLY_125 || reply == FtpConst.Replyes.REPLY_150)
- {
- FtpDataTransiver dataTransiver = clientSession.getDataTransiver();
-
- fileData = dataTransiver.receive();
-
- dataTransiver.close();
-
- String dd = new String(fileData, "windows-1251");
-
- String[] lines = dd.split("\r\n");
-
- String systemType = clientSession.getSystemType();
- systemType = systemType.substring(systemType.indexOf(" ") + 1);
-
- for (int i = 0; i < lines.length; i++)
- {
- try
- {
- FtpFileInfo fileInfo = new FtpFileInfoImpl();
- if (!"".equals(lines[i]))
- {
- fileInfo.parseDir(lines[i], systemType);
- files.add(fileInfo);
- }
- }
- catch (Exception exc)
- {
- log.info("CAN'T PARSE FILE LINE: [" + lines[i] + "]");
- }
- }
- reply = getReply();
- }
- return reply;
- }
- catch (Exception exc)
- {
- log.info("Unhandled exception. " + exc.getMessage(), exc);
- }
- return -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.
+ */
+package org.exoplatform.frameworks.ftpclient.commands;
+
+import org.exoplatform.frameworks.ftpclient.FtpConst;
+import org.exoplatform.frameworks.ftpclient.data.FtpDataTransiver;
+import org.exoplatform.frameworks.ftpclient.data.FtpFileInfo;
+import org.exoplatform.frameworks.ftpclient.data.FtpFileInfoImpl;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
+import java.util.ArrayList;
+
+/**
+ * Created by The eXo Platform SAS .
+ *
+ * @author Vitaly Guly
+ * @version $Id: $
+ */
+
+public class CmdList extends FtpCommandImpl
+{
+
+ private static Log log = ExoLogger.getLogger("exo.jcr.framework.command.CmdList");
+
+ protected String path = "";
+
+ protected byte[] fileData;
+
+ protected ArrayList<FtpFileInfo> files = new ArrayList<FtpFileInfo>();
+
+ public CmdList()
+ {
+ }
+
+ public CmdList(String path)
+ {
+ this.path = path;
+ }
+
+ public byte[] getFileData()
+ {
+ return fileData;
+ }
+
+ public ArrayList<FtpFileInfo> getFiles()
+ {
+ return files;
+ }
+
+ public int execute()
+ {
+ try
+ {
+ if (clientSession.getSystemType() == null)
+ {
+ clientSession.executeCommand(new CmdSyst());
+ }
+
+ String req;
+
+ if ("".equals(path))
+ {
+ req = FtpConst.Commands.CMD_LIST;
+ }
+ else
+ {
+ req = String.format("%s %s", FtpConst.Commands.CMD_LIST, path);
+ }
+ sendCommand(req);
+
+ int reply = getReply();
+
+ if (reply == FtpConst.Replyes.REPLY_125 || reply == FtpConst.Replyes.REPLY_150)
+ {
+ FtpDataTransiver dataTransiver = clientSession.getDataTransiver();
+
+ fileData = dataTransiver.receive();
+
+ dataTransiver.close();
+
+ String dd = new String(fileData, "utf-8");
+
+ String[] lines = dd.split("\r\n");
+
+ String systemType = clientSession.getSystemType();
+ systemType = systemType.substring(systemType.indexOf(" ") + 1);
+
+ for (int i = 0; i < lines.length; i++)
+ {
+ try
+ {
+ FtpFileInfo fileInfo = new FtpFileInfoImpl();
+ if (!"".equals(lines[i]))
+ {
+ fileInfo.parseDir(lines[i], systemType);
+ files.add(fileInfo);
+ }
+ }
+ catch (Exception exc)
+ {
+ log.info("CAN'T PARSE FILE LINE: [" + lines[i] + "]");
+ }
+ }
+ reply = getReply();
+ }
+ return reply;
+ }
+ catch (Exception exc)
+ {
+ log.info("Unhandled exception. " + exc.getMessage(), exc);
+ }
+ return -1;
+ }
+
+}
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2900 - in jcr/branches/1.12.x/exo.jcr.component.ftp/src: main/resources/conf and 1 other directories.
by do-not-reply＠jboss.org
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>
- *
- * @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>
+ *
+ * @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
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2899 - jcr/branches/1.12.x.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:55:05 -0400 (Mon, 09 Aug 2010)
New Revision: 2899
Modified:
jcr/branches/1.12.x/pom.xml
Log:
EXOJCR-884 documentation poms updated
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
+++ jcr/branches/1.12.x/pom.xml 2010-08-09 09:55:05 UTC (rev 2899)
@@ -460,7 +460,7 @@
<module>exo.jcr.framework.web</module>
<module>exo.jcr.framework.ftpclient</module>
<module>applications</module>
- <module>docs</module>
+ <module>exo.jcr.docs</module>
<module>packaging/module</module>
</modules>
</project>
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2898 - in jcr/branches/1.12.x/exo.jcr.docs: exo.jcr.docs.developer and 4 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:54:24 -0400 (Mon, 09 Aug 2010)
New Revision: 2898
Added:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
Modified:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
Log:
EXOJCR-884 documentation poms updated
Added: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -0,0 +1,38 @@
+<!--
+
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>jcr-parent</artifactId>
+ <version>1.12.3-GA-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcr.docs.developer</artifactId>
+
+ <name>eXo JCR :: Developer Documentation :: Reactor</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>reference</module>
+ <module>userguide</module>
+ </modules>
+</project>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en/pom.xml 2010-08-09 09:44:52 UTC (rev 2897)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/en/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>reference-docs-${translation}</artifactId>
- <name>eXo JCR :: Documentation :: Reference (${translation})</name>
+ <name>eXo JCR :: Developer Documentation :: Reference (${translation})</name>
<packaging>jdocbook</packaging>
<properties>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml 2010-08-09 09:44:52 UTC (rev 2897)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>reference-docs</artifactId>
- <name>eXo JCR :: Documentation :: Reference</name>
+ <name>eXo JCR :: Developer Documentation :: Reference</name>
<packaging>pom</packaging>
<modules>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/en/pom.xml 2010-08-09 09:44:52 UTC (rev 2897)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/en/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>userguide-docs-${translation}</artifactId>
- <name>eXo JCR :: Documentation :: User Guide (${translation})</name>
+ <name>eXo JCR :: Developer Documentation :: User Guide (${translation})</name>
<packaging>jdocbook</packaging>
<properties>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/pom.xml 2010-08-09 09:44:52 UTC (rev 2897)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>userguide-docs</artifactId>
- <name>eXo JCR :: Documentation :: User Guide</name>
+ <name>eXo JCR :: Developer Documentation :: User Guide</name>
<packaging>pom</packaging>
<modules>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-08-09 09:44:52 UTC (rev 2897)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2010-08-09 09:54:24 UTC (rev 2898)
@@ -26,15 +26,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>docs</artifactId>
+ <artifactId>exo.jcr.docs</artifactId>
<name>eXo JCR :: Documentation :: Reactor</name>
<packaging>pom</packaging>
<modules>
- <module>reference</module>
- <module>userguide</module>
- <!-- module>migrationguide</module>
- <module>faq</module -->
+ <module>exo.jcr.docs.developer</module>
+ <!--module>exo.jcr.docs.user</module-->
</modules>
</project>
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2897 - in jcr/branches/1.12.x/exo.jcr.docs: exo.jcr.docs.developer and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:44:52 -0400 (Mon, 09 Aug 2010)
New Revision: 2897
Added:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference/
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide/
Removed:
jcr/branches/1.12.x/exo.jcr.docs/reference/
jcr/branches/1.12.x/exo.jcr.docs/userguide/
Log:
EXOJCR-884 reference and userguide moved to exo.jcr.docs.developer folder
Copied: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/reference (from rev 2896, jcr/branches/1.12.x/exo.jcr.docs/reference)
Copied: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/userguide (from rev 2896, jcr/branches/1.12.x/exo.jcr.docs/userguide)
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2896 - jcr/branches/1.12.x/exo.jcr.docs.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:38:46 -0400 (Mon, 09 Aug 2010)
New Revision: 2896
Added:
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/
Log:
EXOJCR-884 exo.jcr.docs.developer folder for deleoper's documentations added
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2895 - jcr/branches/1.12.x.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:30:32 -0400 (Mon, 09 Aug 2010)
New Revision: 2895
Added:
jcr/branches/1.12.x/exo.jcr.docs/
Removed:
jcr/branches/1.12.x/docs/
Log:
EXOJCR-884 docs folder renamed to exo.jcr.docs
Copied: jcr/branches/1.12.x/exo.jcr.docs (from rev 2894, jcr/branches/1.12.x/docs)
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2894 - jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:25:38 -0400 (Mon, 09 Aug 2010)
New Revision: 2894
Modified:
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml
Log:
EXOJCR-871 target filename updated
Modified: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml 2010-08-09 09:11:48 UTC (rev 2893)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml 2010-08-09 09:25:38 UTC (rev 2894)
@@ -2,6 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<chapter id="WS.RestServicesList">
+ <?dbhtml filename="ch-ws-restserviceslist-service.html"?>
<title>RestServicesList Service</title>
<section>
13 years, 11 months
- 1
- 0
exo-jcr SVN: r2893 - in jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules: ws and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-08-09 05:11:48 -0400 (Mon, 09 Aug 2010)
New Revision: 2893
Added:
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml
Modified:
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws.xml
Log:
EXOJCR-871 chapter about RestServicesList service added to documentation
Added: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml (rev 0)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws/restservicelist-service.xml 2010-08-09 09:11:48 UTC (rev 2893)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+<chapter id="WS.RestServicesList">
+ <title>RestServicesList Service</title>
+
+ <section>
+ <title>Overview.</title>
+
+ <para>RestServicesList service is intendet to provide information about
+ rest services deployed to the application server.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Path - path to service</para>
+ </listitem>
+
+ <listitem>
+ <para>Regex - service's URL regular expression</para>
+ </listitem>
+
+ <listitem>
+ <para>FQN - full qualified name of service's class</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>The list can be provided in two formats: HTML and JSON.</para>
+ </section>
+
+ <section>
+ <title>Usage</title>
+
+ <note>
+ <para>Class do not implement
+ org.exoplatform.services.rest.resource.ResourceContainer and must never
+ be binded to RESTful framework by using eXoContainer. This service must
+ works as per-request resource.</para>
+ </note>
+
+ <section>
+ <title>HTML format</title>
+
+ <para>To get the list of services in HTML format use listHTML()
+ method:</para>
+
+ <programlisting>@GET
+(a)Produces({MediaType.TEXT_HTML})
+public byte[] listHTML()
+{
+ ...
+} </programlisting>
+
+ <para>to do this perform a simple GET request to the RestServicesList
+ link.</para>
+
+ <para>f.e. curl -u root:exo http://localhost:8080/rest/ will return such
+ HTML code:</para>
+
+ <programlisting><?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <title>eXo JAXRS Implementation</title>
+ </head>
+ <body>
+ <h3 style="text-align:center;">Root resources</h3>
+ <table width="90%" style="table-layout:fixed;">
+ <tr>
+ <th>Path</th>
+ <th>Regex</th>
+ <th>FQN</th>
+ </tr>
+ <tr>
+ <td>script/groovy</td>
+ <td>/script/groovy(/.*)?</td>
+ <td>org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader</td>
+ </tr>
+ <tr>
+ <td>/lnkproducer/</td>
+ <td>/lnkproducer(/.*)?</td>
+ <td>org.exoplatform.services.jcr.webdav.lnkproducer.LnkProducer</td>
+ </tr>
+ <tr>
+ <td>/registry/</td>
+ <td>/registry(/.*)?</td>
+ <td>org.exoplatform.services.jcr.ext.registry.RESTRegistryService</td>
+ </tr>
+ <tr>
+ <td>/jcr</td>
+ <td>/jcr(/.*)?</td>
+ <td>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</td>
+ </tr>
+ <tr>
+ <td>/</td>
+ <td>(/.*)?</td>
+ <td>org.exoplatform.services.rest.ext.service.RestServicesList</td>
+ </tr>
+ </table>
+ </body>
+</html> </programlisting>
+
+ <para>If you perform the same request with your browser you'll see the
+ table with the list of deployed services like this</para>
+
+ <table>
+ <title>Root resources</title>
+
+ <tgroup cols="3">
+ <thead>
+ <row>
+ <entry>Path</entry>
+
+ <entry>Regex</entry>
+
+ <entry>FQN</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>script/groovy</entry>
+
+ <entry>/script/groovy(/.*)?</entry>
+
+ <entry>org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader</entry>
+ </row>
+
+ <row>
+ <entry>/lnkproducer/</entry>
+
+ <entry>/lnkproducer(/.*)?</entry>
+
+ <entry>org.exoplatform.services.jcr.webdav.lnkproducer.LnkProducer</entry>
+ </row>
+
+ <row>
+ <entry>/registry/</entry>
+
+ <entry>/registry(/.*)?</entry>
+
+ <entry>org.exoplatform.services.jcr.ext.registry.RESTRegistryService</entry>
+ </row>
+
+ <row>
+ <entry>/jcr</entry>
+
+ <entry>/jcr(/.*)?</entry>
+
+ <entry>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</entry>
+ </row>
+
+ <row>
+ <entry>/</entry>
+
+ <entry>(/.*)?</entry>
+
+ <entry>org.exoplatform.services.rest.ext.service.RestServicesList</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <section>
+ <title>JSON format</title>
+
+ <para>To get the list of services in HTML format use listJSON()
+ method:</para>
+
+ <programlisting>@GET
+(a)Produces({MediaType.APPLICATION_JSON})
+public RootResourcesList listJSON()
+{
+ ...
+}</programlisting>
+
+ <para>to do this add "Accept:application/json" header to your GET
+ request</para>
+
+ <para>f.e. curl -u root:exo http://localhost:8080/rest/ -H
+ "Accept:application/json" will return such JSON:</para>
+
+ <programlisting>{"rootResources":[
+ {
+ "fqn":"org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader",
+ "regex":"/script/groovy(/.*)?",
+ "path":"script/groovy"
+ },
+ {
+ "fqn":"org.exoplatform.services.jcr.webdav.lnkproducer.LnkProducer",
+ "regex":"/lnkproducer(/.*)?",
+ "path":"/lnkproducer/"
+ },
+ {
+ "fqn":"org.exoplatform.services.jcr.ext.registry.RESTRegistryService",
+ "regex":"/registry(/.*)?",
+ "path":"/registry/"
+ },
+ {
+ "fqn":"org.exoplatform.services.jcr.webdav.WebDavServiceImpl",
+ "regex":"/jcr(/.*)?",
+ "path":"/jcr"
+ },
+ {
+ "fqn":"org.exoplatform.services.rest.ext.service.RestServicesList",
+ "regex":"(/.*)?",
+ "path":"/"
+ }
+]}</programlisting>
+
+ <para></para>
+ </section>
+ </section>
+</chapter>
Modified: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws.xml 2010-08-06 13:45:35 UTC (rev 2892)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/ws.xml 2010-08-09 09:11:48 UTC (rev 2893)
@@ -12,6 +12,9 @@
<xi:include href="ws/introduction-to-rest.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="ws/restservicelist-service.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<xi:include href="ws/groovy-scripts-as-rest-services.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
13 years, 11 months
- 1
- 0