Author: tolusha
Date: 2010-11-24 10:17:46 -0500 (Wed, 24 Nov 2010)
New Revision: 3541
Added:
kernel/branches/2.2.x/exo.kernel.component.command/src/test/resources/
Removed:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/custom-commands.xml
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/standalone/
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands.xml
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands2.xml
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands3.xml
Modified:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml
Log:
JCR-1524: Move JCR framework commands list configuration to it right place
Deleted:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/custom-commands.xml
===================================================================
---
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/custom-commands.xml 2010-11-24
15:01:51 UTC (rev 3540)
+++
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/custom-commands.xml 2010-11-24
15:17:46 UTC (rev 3541)
@@ -1,42 +0,0 @@
-<!--
-
- 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:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml
===================================================================
---
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml 2010-11-24
15:01:51 UTC (rev 3540)
+++
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/portal/configuration.xml 2010-11-24
15:17:46 UTC (rev 3541)
@@ -25,19 +25,6 @@
<component>
<key>org.exoplatform.services.command.impl.CommandService</key>
<type>org.exoplatform.services.command.impl.CommandService</type>
- <component-plugins>
- <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>
- </component-plugins>
</component>
</configuration>
Deleted:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands.xml
===================================================================
---
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands.xml 2010-11-24
15:01:51 UTC (rev 3540)
+++
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands.xml 2010-11-24
15:17:46 UTC (rev 3541)
@@ -1,32 +0,0 @@
-<!--
-
- 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>
-
- <!-- Single command "chains" from CatalogBaseTestCase -->
- <command name="Command1"
className="org.exoplatform.services.command.TestCommand1" />
-
- <!-- Chains with nested commands -->
- <chain name="Execute2">
- <command id="1"
className="org.exoplatform.services.command.TestCommand1" />
- <command id="2"
className="org.exoplatform.services.command.TestCommand1" />
- </chain>
-
-</catalog>
Deleted:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands2.xml
===================================================================
---
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands2.xml 2010-11-24
15:01:51 UTC (rev 3540)
+++
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands2.xml 2010-11-24
15:17:46 UTC (rev 3541)
@@ -1,28 +0,0 @@
-<!--
-
- 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>
-
- <!-- Single command "chains" from CatalogBaseTestCase -->
- <command name="Command2"
className="org.exoplatform.services.command.TestCommand1" />
-
- <command name="Command3"
className="org.exoplatform.services.command.TestCommand1" />
-
-</catalog>
Deleted:
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands3.xml
===================================================================
---
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands3.xml 2010-11-24
15:01:51 UTC (rev 3540)
+++
kernel/branches/2.2.x/exo.kernel.component.command/src/main/resources/conf/test-commands3.xml 2010-11-24
15:17:46 UTC (rev 3541)
@@ -1,28 +0,0 @@
-<!--
-
- 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 name="catalog1">
-
- <!-- Single command "chains" from CatalogBaseTestCase -->
- <command name="Command2"
className="org.exoplatform.services.command.TestCommand1" />
-
- <command name="Command3"
className="org.exoplatform.services.command.TestCommand1" />
-
-</catalog>