Author: tolusha Date: 2010-11-25 03:16:45 -0500 (Thu, 25 Nov 2010) New Revision: 3548 Modified: jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/custom-commands.xml jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml Log: JCR-1524: fix Modified: jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/custom-commands.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/custom-commands.xml 2010-11-25 07:55:08 UTC (rev 3547) +++ jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/custom-commands.xml 2010-11-25 08:16:45 UTC (rev 3548) @@ -40,45 +40,3 @@ <command name="CreateFolder" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.CreateFolderCommand" /> </catalog> -<!-- - - 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. - ---> -<catalog> - <command name="addNode" className="org.exoplatform.frameworks.jcr.command.core.AddNodeCommand" /> - <command name="save" className="org.exoplatform.frameworks.jcr.command.core.SaveCommand" /> - <command name="filterNodesByTypes" className="org.exoplatform.frameworks.jcr.command.ext.FilterNodesByTypesCommand" /> - <command name="addResourceFile" className="org.exoplatform.frameworks.jcr.command.ext.AddResourceFileCommand" /> - <command name="displayResource" className="org.exoplatform.frameworks.jcr.command.web.DisplayResourceCommand" /> - <command name="getNode" className="org.exoplatform.frameworks.jcr.command.core.GetNodeCommand" /> - - - <!-- chain name="displayResource"> - <command id="1" className="org.exoplatform.frameworks.jcr.command.core.GetNodeCommand" /> - <command id="2" className="org.exoplatform.frameworks.jcr.command.web.DisplayResourceCommand" /> - </chain --> - - <!-- FCKEditor --> - <command name="GetFolders" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.GetFoldersOrFilesCommand" /> - <command name="GetFiles" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.GetFoldersOrFilesCommand" /> - <command name="GetFoldersAndFiles" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.GetFoldersOrFilesCommand" /> - <command name="FileUpload" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.UploadFileCommand" /> - <command name="CreateFolder" className="org.exoplatform.frameworks.jcr.command.web.fckeditor.CreateFolderCommand" /> - -</catalog> Modified: jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml 2010-11-25 07:55:08 UTC (rev 3547) +++ jcr/branches/1.12.x/exo.jcr.framework.command/src/main/resources/conf/portal/configuration.xml 2010-11-25 08:16:45 UTC (rev 3548) @@ -38,43 +38,3 @@ </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"> - - <external-component-plugins> - <target-component>org.exoplatform.services.command.impl.CommandService</target-component> - <component-plugin> - <name>config.catalog</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.command.impl.CommonsXMLConfigurationPlugin</type> - <init-params> - <value-param> - <name>config-file</name> - <value>jar:/conf/custom-commands.xml</value> - </value-param> - </init-params> - </component-plugin> - </external-component-plugins> - -</configuration>