From: <fg...@us...> - 2010-09-12 15:12:17
|
Revision: 3080 http://openutils.svn.sourceforge.net/openutils/?rev=3080&view=rev Author: fgiust Date: 2010-09-12 15:12:09 +0000 (Sun, 12 Sep 2010) Log Message: ----------- renaming Modified Paths: -------------- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml Added Paths: ----------- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/ trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlrules/ trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlrules/pages/ Removed Paths: ------------- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/dialog/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/el/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/grid/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/samples/render/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/expressions/ trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlexpressions/pages/ Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/Expression.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.configuration; +package net.sourceforge.openutils.mgnlrules.configuration; import java.util.Comparator; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionFunctionManager.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.configuration; +package net.sourceforge.openutils.mgnlrules.configuration; import info.magnolia.cms.beans.config.ObservedManager; import info.magnolia.cms.core.Content; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionLibrary.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.configuration; +package net.sourceforge.openutils.mgnlrules.configuration; import java.util.List; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionLibraryManager.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.configuration; +package net.sourceforge.openutils.mgnlrules.configuration; import info.magnolia.cms.beans.config.ObservedManager; import info.magnolia.cms.core.Content; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/RepositoryExpressionLibrary.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.configuration; +package net.sourceforge.openutils.mgnlrules.configuration; import info.magnolia.cms.core.Content; import info.magnolia.cms.util.ContentUtil; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/dialog/ExpressionDialog.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.dialog; +package net.sourceforge.openutils.mgnlrules.dialog; import java.util.Map; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/el/ExpressionsElFunctions.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.el; +package net.sourceforge.openutils.mgnlrules.el; import info.magnolia.context.MgnlContext; import info.magnolia.context.WebContext; @@ -29,7 +29,7 @@ import javax.servlet.jsp.JspException; import javax.servlet.jsp.PageContext; -import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionFunctionManager; +import net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager; import org.apache.taglibs.standard.lang.jstl.Evaluator; import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/grid/ExpressionGridColumnType.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.grid; +package net.sourceforge.openutils.mgnlrules.grid; import info.magnolia.cms.i18n.Messages; import info.magnolia.context.MgnlContext; Deleted: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/ExpressionsModule.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,67 +0,0 @@ -/** - * - * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html) - * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlexpressions.module; - -import info.magnolia.module.ModuleLifecycle; -import info.magnolia.module.ModuleLifecycleContext; -import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionFunctionManager; -import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibraryManager; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @author dschivo - * @version $Id$ - */ -public class ExpressionsModule implements ModuleLifecycle -{ - - /** - * Logger. - */ - private Logger log = LoggerFactory.getLogger(ExpressionsModule.class); - - /** - * {@inheritDoc} - */ - public void start(ModuleLifecycleContext moduleLifecycleContext) - { - log.info("Starting module expressions"); - - // Enable support for EL functions in expression editor - System.setProperty("javax.servlet.jsp.functions.allowed", "true"); - - moduleLifecycleContext.registerModuleObservingComponent("expression-libraries", ExpressionLibraryManager - .getInstance()); - moduleLifecycleContext.registerModuleObservingComponent("expression-functions", ExpressionFunctionManager - .getInstance()); - } - - /** - * {@inheritDoc} - */ - public void stop(ModuleLifecycleContext moduleLifecycleContext) - { - log.info("Stopping module expressions"); - } - -} Copied: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java (from rev 3079, trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/ExpressionsModule.java) =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java (rev 0) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,67 @@ +/** + * + * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html) + * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlrules.module; + +import info.magnolia.module.ModuleLifecycle; +import info.magnolia.module.ModuleLifecycleContext; +import net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager; +import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author dschivo + * @version $Id$ + */ +public class RuleModule implements ModuleLifecycle +{ + + /** + * Logger. + */ + private Logger log = LoggerFactory.getLogger(RuleModule.class); + + /** + * {@inheritDoc} + */ + public void start(ModuleLifecycleContext moduleLifecycleContext) + { + log.info("Starting module expressions"); + + // Enable support for EL functions in expression editor + System.setProperty("javax.servlet.jsp.functions.allowed", "true"); + + moduleLifecycleContext.registerModuleObservingComponent("expression-libraries", ExpressionLibraryManager + .getInstance()); + moduleLifecycleContext.registerModuleObservingComponent("expression-functions", ExpressionFunctionManager + .getInstance()); + } + + /** + * {@inheritDoc} + */ + public void stop(ModuleLifecycleContext moduleLifecycleContext) + { + log.info("Stopping module expressions"); + } + +} Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/ExpressionPicker.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.pages; +package net.sourceforge.openutils.mgnlrules.pages; import info.magnolia.module.admininterface.TemplatedMVCHandler; @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibrary; -import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibraryManager; +import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibrary; +import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/ExpressionValidator.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.pages; +package net.sourceforge.openutils.mgnlrules.pages; import info.magnolia.module.admininterface.TemplatedMVCHandler; @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import net.sourceforge.openutils.mgnlexpressions.el.ExpressionsElFunctions; +import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/samples/render/ConditionalRenderer.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.samples.render; +package net.sourceforge.openutils.mgnlrules.samples.render; import info.magnolia.cms.core.Content; import info.magnolia.cms.util.NodeDataUtil; @@ -28,7 +28,7 @@ import java.io.Writer; import java.util.Map; -import net.sourceforge.openutils.mgnlexpressions.el.ExpressionsElFunctions; +import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions; /** Deleted: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/ExpressionsModuleVersionHandler.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,79 +0,0 @@ -/** - * - * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html) - * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlexpressions.setup; - -import info.magnolia.cms.core.SystemProperty; -import info.magnolia.module.InstallContext; -import info.magnolia.module.delta.Task; -import it.openutils.mgnltasks.SimpleModuleVersionHandler; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang.StringUtils; - - -/** - * @author dschivo - * @version $Id$ - */ -public class ExpressionsModuleVersionHandler extends SimpleModuleVersionHandler -{ - - /** - * {@inheritDoc} - */ - @Override - protected List<Task> getStartupTasks(InstallContext installContext) - { - List<Task> tasks = new ArrayList<Task>(); - - tasks.add(new FilesExtractionTask() - { - - /** - * {@inheritDoc} - */ - @Override - protected boolean accept(String resource) - { - return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/"); - } - }); - - if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES)) - { - tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.") - { - - /** - * {@inheritDoc} - */ - @Override - protected boolean accept(String resource) - { - return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/"); - } - }); - } - - return tasks; - } -} Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/FilesExtractionTask.java 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -package net.sourceforge.openutils.mgnlexpressions.setup; +package net.sourceforge.openutils.mgnlrules.setup; import info.magnolia.cms.core.HierarchyManager; import info.magnolia.cms.core.Path; Copied: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java (from rev 3079, trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/ExpressionsModuleVersionHandler.java) =================================================================== --- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java (rev 0) +++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,79 @@ +/** + * + * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html) + * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlrules.setup; + +import info.magnolia.cms.core.SystemProperty; +import info.magnolia.module.InstallContext; +import info.magnolia.module.delta.Task; +import it.openutils.mgnltasks.SimpleModuleVersionHandler; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author dschivo + * @version $Id$ + */ +public class RuleModuleVersionHandler extends SimpleModuleVersionHandler +{ + + /** + * {@inheritDoc} + */ + @Override + protected List<Task> getStartupTasks(InstallContext installContext) + { + List<Task> tasks = new ArrayList<Task>(); + + tasks.add(new FilesExtractionTask() + { + + /** + * {@inheritDoc} + */ + @Override + protected boolean accept(String resource) + { + return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/"); + } + }); + + if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES)) + { + tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.") + { + + /** + * {@inheritDoc} + */ + @Override + protected boolean accept(String resource) + { + return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/"); + } + }); + } + + return tasks; + } +} Deleted: trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module SYSTEM "module.dtd"> -<module> - <name>expressions</name> - <displayName>expressions</displayName> - <description>Openutils - Magnolia Expressions Library</description> - <class>net.sourceforge.openutils.mgnlexpressions.module.ExpressionsModule</class> - <versionHandler>net.sourceforge.openutils.mgnlexpressions.setup.ExpressionsModuleVersionHandler</versionHandler> - <version>${project.version}</version> -</module> \ No newline at end of file Copied: trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml) =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml (rev 0) +++ trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module SYSTEM "module.dtd"> +<module> + <name>rules</name> + <displayName>rules</displayName> + <description>Openutils - Magnolia Rule Module</description> + <class>net.sourceforge.openutils.mgnlrules.module.RuleModule</class> + <versionHandler>net.sourceforge.openutils.mgnlrules.setup.RuleModuleVersionHandler</versionHandler> + <version>${project.version}</version> +</module> \ No newline at end of file Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.controls.expression.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>a52c6261-148c-4d86-a3ba-0ba7d955f203</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlexpressions.dialog.ExpressionDialog</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-01-12T18:12:19.468+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-17T17:42:10.997+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.gridColumnTypes.expression.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>12b41f1f-ba84-45cb-9f15-c875bdacbf2a</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlexpressions.grid.ExpressionGridColumnType</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-06-18T11:41:55.562+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-07-02T14:55:38.921+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-picker.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="expression-picker" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>c3145133-f1bd-4c55-b4f8-348d8d4da644</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlexpressions.pages.ExpressionPicker</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-01-12T10:35:51.750+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-18T10:36:55.375+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-validator.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="expression-validator" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>b2ad8339-87ad-4fd1-b2df-e7008aea27a1</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlexpressions.pages.ExpressionValidator</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-01-12T10:35:51.750+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-18T12:43:21.343+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.controls.expression.xml) =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml (rev 0) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>a52c6261-148c-4d86-a3ba-0ba7d955f203</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlrules.dialog.ExpressionDialog</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-01-12T18:12:19.468+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-17T17:42:10.997+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.gridColumnTypes.expression.xml) =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml (rev 0) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>12b41f1f-ba84-45cb-9f15-c875bdacbf2a</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlrules.grid.ExpressionGridColumnType</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-06-18T11:41:55.562+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-07-02T14:55:38.921+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-picker.xml) =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml (rev 0) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="expression-picker" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>c3145133-f1bd-4c55-b4f8-348d8d4da644</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlrules.pages.ExpressionPicker</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-01-12T10:35:51.750+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-18T10:36:55.375+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-validator.xml) =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml (rev 0) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="expression-validator" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>b2ad8339-87ad-4fd1-b2df-e7008aea27a1</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlrules.pages.ExpressionValidator</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-01-12T10:35:51.750+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-18T12:43:21.343+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Modified: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml =================================================================== --- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/expressions/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml 2010-09-12 13:04:43 UTC (rev 3079) +++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml 2010-09-12 15:12:09 UTC (rev 3080) @@ -10,7 +10,7 @@ <sv:value>441881dc-85ba-4469-b56e-d150067ce491</sv:value> </sv:property> <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlexpressions.samples.render.ConditionalRenderer</sv:value> + <sv:value>net.sourceforge.openutils.mgnlrules.samples.render.ConditionalRenderer</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |