openutils-svn

[Openutils-svn] SF.net SVN: openutils:[3861] magnoliamodules/trunk/openutils-mgnlrules/src/ main

[<die...@us...>]

Revision: 3861
          http://openutils.svn.sourceforge.net/openutils/?rev=3861&view=rev
Author:   diego_schivo
Date:     2012-03-20 18:09:48 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
openutils-mgnlrules components

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java	2012-03-20 18:09:18 UTC (rev 3860)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java	2012-03-20 18:09:48 UTC (rev 3861)
@@ -29,6 +29,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.inject.Singleton;
+
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +40,7 @@
  * @author dschivo
  * @version $Id$
  */
+@Singleton
 public class ExpressionLibraryManager extends ObservedManager
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2012-03-20 18:09:18 UTC (rev 3860)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2012-03-20 18:09:48 UTC (rev 3861)
@@ -7,4 +7,11 @@
   <class>net.sourceforge.openutils.mgnlrules.module.RuleModule</class>
     <versionHandler>net.sourceforge.openutils.mgnlrules.setup.RuleModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
+  <components>
+    <id>main</id>
+    <component>
+      <type>net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager</type>
+      <implementation>net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager</implementation>
+    </component>
+  </components>
 </module>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[3864] magnoliamodules/trunk/openutils-mgnlrules/src/ main

[<die...@us...>]

Revision: 3864
          http://openutils.svn.sourceforge.net/openutils/?rev=3864&view=rev
Author:   diego_schivo
Date:     2012-03-20 18:31:23 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
ExpressionFunctionManager

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2012-03-20 18:30:43 UTC (rev 3863)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2012-03-20 18:31:23 UTC (rev 3864)
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Singleton;
 import javax.jcr.RepositoryException;
 
 import org.slf4j.Logger;
@@ -41,6 +42,7 @@
 /**
  * @author dschivo
  */
+@Singleton
 public class ExpressionFunctionManager extends ObservedManager
 {
 

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2012-03-20 18:30:43 UTC (rev 3863)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2012-03-20 18:31:23 UTC (rev 3864)
@@ -13,5 +13,9 @@
       <type>net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager</type>
       <implementation>net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager</implementation>
     </component>
+    <component>
+      <type>net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager</type>
+      <implementation>net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager</implementation>
+    </component>
   </components>
 </module>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openutils-svn] SF.net SVN: openutils:[4304] magnoliamodules/trunk/openutils-mgnlrules/src/ main

[<fg...@us...>]

Revision: 4304
          http://openutils.svn.sourceforge.net/openutils/?rev=4304&view=rev
Author:   fgiust
Date:     2013-09-15 13:04:18 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
update for magnolia 4.5 + freemarker support

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/expressions/evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-evaluate.ftl
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-expressions/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/template.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlexpressions/

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2013-09-15 13:04:18 UTC (rev 4304)
@@ -69,7 +69,7 @@
                 @Override
                 protected boolean accept(String resource)
                 {
-                    return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/");
+                    return super.accept(resource) && StringUtils.contains(resource, "/samples-rules/");
                 }
             });
         }

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,14 +0,0 @@
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
-  <description>Magnolia expressions Tags and EL functions</description>
-  <display-name>Magnolia expressions Tags and EL functions</display-name>
-  <tlib-version>1.0</tlib-version>
-  <short-name>mexpr</short-name>
-  <uri>mgnlexpressions</uri>
-  <function>
-    <name>evaluate</name>
-    <function-class>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</function-class>
-    <function-signature>java.lang.Object evaluate(java.lang.String, javax.servlet.jsp.PageContext)</function-signature>
-  </function>
-</taglib>
\ No newline at end of file

Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld (from rev 4303, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlrules.tld	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,14 @@
+<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+  version="2.0">
+  <description>Magnolia expressions Tags and EL functions</description>
+  <display-name>Magnolia expressions Tags and EL functions</display-name>
+  <tlib-version>1.0</tlib-version>
+  <short-name>mexpr</short-name>
+  <uri>mgnlrules</uri>
+  <function>
+    <name>evaluate</name>
+    <function-class>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</function-class>
+    <function-signature>java.lang.Object evaluate(java.lang.String, javax.servlet.jsp.PageContext)</function-signature>
+  </function>
+</taglib>
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-conditional" 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>441881dc-85ba-4469-b56e-d150067ce491</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <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>
-  </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-05-21T11:08:17.640+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-conditional" 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>6566274c-be79-4323-92ef-fce996787484</sv:value>
-  </sv:property>
-  <sv:property sv:name="description" sv:type="String">
-    <sv:value>Sample paragraph using a custom conditional renderer.</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/templates/samples-expressions/paragraph-conditional.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Conditional sample for module expressions</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>samples-expressions-conditional</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>2008-09-25T12:45:26.721+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-21T11:38:27.265+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-evaluate" 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>c5df50f9-8fa2-40f7-8924-dde615945122</sv:value>
-  </sv:property>
-  <sv:property sv:name="description" sv:type="String">
-    <sv:value>Sample paragraph evaluating an expression.</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/templates/samples-expressions/paragraph-evaluate.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Evaluate sample for module expressions</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>jsp</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>2008-09-25T12:45:26.721+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-21T09:51:04.328+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-grid" 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>9bec3d19-47c0-410a-9670-dfaaea1799a8</sv:value>
-  </sv:property>
-  <sv:property sv:name="description" sv:type="String">
-    <sv:value>Sample grid paragraph with a column of expressions.</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/templates/samples-expressions/paragraph-grid.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Grid sample for module expressions</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>jsp</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>2008-09-25T12:45:26.721+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-07-02T15:03:44.640+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="samples-expressions-if-then-else" 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>6796f33b-186e-4f07-8256-d39c7a3d3544</sv:value>
-  </sv:property>
-  <sv:property sv:name="description" sv:type="String">
-    <sv:value>Sample paragraph choosing the text to display based on a condition.</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/templates/samples-expressions/paragraph-if-then-else.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>If-then-else sample for module expressions</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>jsp</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>2008-09-25T12:45:26.721+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-21T09:50:00.796+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>97035def-7c76-4aa3-bf0f-42b26d1936b0</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <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>
+  </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-05-21T11:08:17.640+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-conditional" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>986d3532-519d-425b-9002-9e2dfc0fcc7b</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample paragraph using a custom conditional renderer.</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>rules:samples-rules-conditional</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>rules</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-rules/paragraph-conditional.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Conditional sample for module expressions (jsp)</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>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T00:14:05.495+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-evaluate" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>988b8fcd-48d9-4387-8edc-465a68e604af</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample paragraph evaluating an expression.</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>samples-rules-evaluate</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>freemarker</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/samples-rules/paragraph-evaluate.ftl</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Evaluate sample for module expressions (freemarker)</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>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T00:14:21.552+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-grid" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>718c787b-e76d-495d-b7e5-f01a07d3b59d</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample grid paragraph with a column of expressions.</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>samples-rules-grid</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-rules/paragraph-grid.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Grid sample for module expressions (jsp)</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>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T00:14:37.112+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-if-then-else" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>1ca0c5cf-10d4-4877-a4a5-b68529a88b11</sv:value>
+  </sv:property>
+  <sv:property sv:name="description" sv:type="String">
+    <sv:value>Sample paragraph choosing the text to display based on a condition.</sv:value>
+  </sv:property>
+  <sv:property sv:name="dialog" sv:type="String">
+    <sv:value>rules:samples-rules-if-then-else</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/templates/samples-rules/paragraph-if-then-else.jsp</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>If-then-else sample for module expressions (jsp)</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>2008-09-25T12:45:26.721+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T00:13:41.935+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-sample-template" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>0f82621e-b970-469f-acf0-63919fb1b6f4</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:property sv:name="renderType" sv:type="String">
+    <sv:value>freemarker</sv:value>
+  </sv:property>
+  <sv:property sv:name="templateScript" sv:type="String">
+    <sv:value>/samples-rules/template-rules.ftl</sv:value>
+  </sv:property>
+  <sv:property sv:name="title" sv:type="String">
+    <sv:value>Rules sample template</sv:value>
+  </sv:property>
+  <sv:property sv:name="visible" sv:type="String">
+    <sv:value>true</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>2008-09-23T16:56:46.344+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T00:29:21.983+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="areas">
+    <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:multiple="true">
+      <sv:value>mix:lockable</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>ef88824e-e224-4939-b235-6439fa93bdc2</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>2012-03-21T07:30:29.457+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2013-09-13T22:52:27.240+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="main">
+      <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:multiple="true">
+        <sv:value>mix:lockable</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>3f8cd8a9-e7e8-4a7e-844c-12da5b7e4307</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>list</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>2012-03-21T07:30:36.643+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2013-09-13T22:52:27.241+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="availableComponents">
+        <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:multiple="true">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>6c0289af-eba3-4ee9-be8e-d870a8e35599</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>2012-03-21T07:32:04.848+01:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2013-09-13T22:52:27.241+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+        <sv:node sv:name="samples-rules-grid">
+          <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:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>740c561f-c34c-485f-9668-d8974d278ce2</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>media:components/samples-media</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>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-09-13T22:52:50.710+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+        <sv:node sv:name="samples-rules-evaluate">
+          <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:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>6f553927-93a6-4a38-ac90-080b1e2125f5</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>media:components/samples-mediatag</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>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-09-13T22:53:04.509+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+        <sv:node sv:name="samples-rules-conditional">
+          <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:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>84f6e327-bae3-48b5-8236-9d1733a364ad</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>media:components/samples-playlist</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>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-09-13T22:53:09.034+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+        <sv:node sv:name="samples-rules-if-then-else">
+          <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:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>18d9eca7-7656-4f04-ae25-ce2cc1463d0c</sv:value>
+          </sv:property>
+          <sv:property sv:name="id" sv:type="String">
+            <sv:value>media:components/samples-media-grid</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>2012-03-21T07:32:14.200+01:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2013-09-13T22:53:13.415+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="sampleExpressions" 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>18983ea3-5ac4-466b-87d7-9125923b2224</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="templatePath" sv:type="String">
-    <sv:value>/templates/samples-expressions/template.jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="title" sv:type="String">
-    <sv:value>Expressions sample template</sv:value>
-  </sv:property>
-  <sv:property sv:name="type" sv:type="String">
-    <sv:value>jsp</sv:value>
-  </sv:property>
-  <sv:property sv:name="visible" sv:type="String">
-    <sv:value>true</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>2008-09-23T16:56:46.344+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-17T17:32:00.676+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml	2013-09-13 17:33:59 UTC (rev 4303)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml	2013-09-15 13:04:18 UTC (rev 4304)
@@ -32,12 +32,12 @@
       <sv:value>2010-09-12T17:55:19.162+02:00</sv:value>
     </sv:property>
     <sv:property sv:name="mgnl:template" sv:type="String">
-      <sv:value>sampleExpressions</sv:value>
+      <sv:value>rules:pages/rules-sample-template</sv:value>
     </sv:property>
   </sv:node>
   <sv:node sv:name="main">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:contentNode</sv:value>
+      <sv:value>mgnl:area</sv:value>
     </sv:property>
     <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
       <sv:value>mix:lockable</sv:value>
@@ -67,7 +67,7 @@
     </sv:node>
     <sv:node sv:name="00">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -98,13 +98,13 @@
           <sv:value>2010-05-27T09:15:41.531+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-expressions-evaluate</sv:value>
+          <sv:value>rules:components/rules-samples-evaluate</sv:value>
         </sv:property>
       </sv:node>
     </sv:node>
     <sv:node sv:name="01">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -141,12 +141,12 @@
           <sv:value>2010-05-27T10:16:15.375+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-expressions-if-then-else</sv:value>
+          <sv:value>rules:components/rules-samples-if-then-else</sv:value>
         </sv:property>
       </sv:node>
       <sv:node sv:name="thenText_files">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -171,7 +171,7 @@
       </sv:node>
       <sv:node sv:name="elseText_files">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -197,7 +197,7 @@
     </sv:node>
     <sv:node sv:name="02">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -231,12 +231,12 @@
           <sv:value>2010-09-12T17:54:33.612+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:template" sv:type="String">
-          <sv:value>samples-expressions-conditional</sv:value>
+          <sv:value>rules:components/rules-samples-conditional</sv:value>
         </sv:property>
       </sv:node>
       <sv:node sv:name="text_files">
         <sv:property sv:name="jcr:primaryType" sv:type="Name">
-          <sv:value>mgnl:contentNode</sv:value>
+          <sv:value>mgnl:component</sv:value>
         </sv:property>
         <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
           <sv:value>mix:lockable</sv:value>
@@ -262,7 +262,7 @@
     </sv:node>
     <sv:node sv:name="0">
       <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:contentNode</sv:value>
+        <sv:value>mgnl:component</sv:value>
       </sv:property>
       <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
         <sv:value>mix:lockable</sv:value>
@@ -275,13 +275,6 @@
 magnoliaUser().name
 
 
-
-
-
-
-
-
-
 </sv:...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[4306] magnoliamodules/trunk/openutils-mgnlrules/src/ main

[<fg...@us...>]

Revision: 4306
          http://openutils.svn.sourceforge.net/openutils/?rev=4306&view=rev
Author:   fgiust
Date:     2013-09-15 14:29:16 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
cleanup samples

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-evaluate.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-grid.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-if-then-else.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.pages.rules-sample-template.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-evaluate.ftl
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl

Added Paths:
-----------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.components.rules-samples-conditional-freemarker.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/bootstrap.min.css
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-resources/rules/css/rules-samples.css
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/paragraph-conditional.ftl

Removed Paths:
-------------
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-conditional.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-evaluate.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-grid.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-if-then-else.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/expressions/
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2013-09-15 14:29:16 UTC (rev 4306)
@@ -121,7 +121,7 @@
 
                 try
                 {
-                    functions.put("mexpr:" + functionName, methodClass.getMethod(methodName, parameterTypes
+                    functions.put("rules:" + functionName, methodClass.getMethod(methodName, parameterTypes
                         .toArray(new Class[0])));
                 }
                 catch (SecurityException e)

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java	2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java	2013-09-15 14:29:16 UTC (rev 4306)
@@ -44,19 +44,10 @@
 public class ExpressionsElFunctions
 {
 
-    /**
-     * 
-     */
     public static final String EXPRESSION_KEY = ExpressionsElFunctions.class.getName() + ".expression";
 
-    /**
-     * 
-     */
-    public static final String EVALUATE_JSP = "/WEB-INF/jsps/expressions/evaluate.jsp";
+    public static final String EVALUATE_JSP = "/WEB-INF/jsps/rules/evaluate.jsp";
 
-    /**
-     * Logger.
-     */
     private static Logger log = LoggerFactory.getLogger(ExpressionsElFunctions.class);
 
     /**
@@ -69,6 +60,8 @@
      */
     public static Object evaluate(String expression, PageContext pageContext) throws JspException
     {
+        WebContext wc = MgnlContext.getWebContext("Expressions can only be evaluated with a WebContext");
+
         Evaluator evaluator = (Evaluator) ExpressionEvaluatorManager
             .getEvaluatorByName(ExpressionEvaluatorManager.EVALUATOR_CLASS);
         return evaluator.evaluate(
@@ -78,7 +71,7 @@
             null,
             pageContext,
             ExpressionFunctionManager.getInstance().getFunctions(),
-            "mexpr");
+            "rules");
     }
 
     /**
@@ -92,6 +85,7 @@
     public static String evaluate(String expression) throws ServletException, IOException
     {
         WebContext wc = MgnlContext.getWebContext("Expressions can only be evaluated with a WebContext");
+
         wc.getRequest().setAttribute(EXPRESSION_KEY, expression);
         StringWriter sw = new StringWriter();
         wc.include(EVALUATE_JSP, sw);

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java	2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java	2013-09-15 14:29:16 UTC (rev 4306)
@@ -19,10 +19,13 @@
 
 package net.sourceforge.openutils.mgnlrules.samples.render;
 
+import info.magnolia.context.MgnlContext;
 import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.objectfactory.Components;
 import info.magnolia.rendering.context.RenderingContext;
 import info.magnolia.rendering.engine.RenderException;
-import info.magnolia.rendering.renderer.JspRenderer;
+import info.magnolia.rendering.renderer.AbstractRenderer;
+import info.magnolia.rendering.renderer.registry.RendererRegistry;
 import info.magnolia.rendering.template.RenderableDefinition;
 
 import java.util.Map;
@@ -31,14 +34,17 @@
 
 import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions;
 
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
 
+
 /**
  * Custom paragraph renderer that evaluates an expression before rendering the jsp, when a pageContext is not yet
  * available. This sample uses the overload of the evaluate method that does not need a pageContext.
  * @author dschivo
  * @version $Id$
  */
-public class ConditionalRenderer extends JspRenderer
+public class ConditionalRenderer extends AbstractRenderer
 {
 
     /**
@@ -48,14 +54,20 @@
     protected void onRender(Node content, RenderableDefinition definition, RenderingContext renderingCtx,
         Map<String, Object> ctx, String templateScript) throws RenderException
     {
+
         String expression = PropertyUtil.getString(content, "renderCondition");
         try
         {
             // expression evaluation without a pageContext
             String result = ExpressionsElFunctions.evaluate(expression);
-            if ("true".equals(result))
+            if (BooleanUtils.toBoolean(result))
             {
-                super.onRender(content, definition, renderingCtx, ctx, templateScript);
+
+                String templatetype = StringUtils.endsWith(templateScript, "jsp") ? "jsp" : "freemarker";
+
+                Components.getComponent(RendererRegistry.class).getRenderer(templatetype).render(renderingCtx, ctx);
+
+                // super.onRender(content, definition, renderingCtx, ctx, templateScript);
             }
         }
         catch (Exception e)
@@ -64,4 +76,13 @@
         }
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected Map<String, Object> newContext()
+    {
+        return MgnlContext.getWebContext("Rules renderer can only be used with a WebContext");
+    }
+
 }

Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml	2013-09-15 13:06:35 UTC (rev 4305)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="rules" 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:multiple="true">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml (from rev 4304, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/config.server.rendering.freemarker.sharedVariables.rules.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.server.rendering.freemarker.sharedVariables.rules.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>88ddbc3d-9ed8-436b-babb-21a0b50f3c06</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-14T22:15:07.920+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml (from rev 4304, magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.renderers.rules.xml)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/config.modules.rules.renderers.rules.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules" 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:multiple="true">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>97035def-7c76-4aa3-bf0f-42b26d1936b0</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <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>
+  </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-05-21T11:08:17.640+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-21T11:22:30.718+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-conditional" 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:uuid" sv:type="String">
+    <sv:value>b7b207c2-b832-4b7e-94d6-9e9b7536e986</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String">
+      <sv:value>MetaData</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:activatorid" sv:type="String">
+      <sv:value>superuser</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="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-15T15:44:22.300+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:title" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabConditional">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>6616ceb2-65dc-4bd5-bc10-0141cf0b9c91</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Conditional</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-21T11:28:52.968+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="renderCondition">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>a1a14b60-9d2d-45b4-b292-d177ab277ac5</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>expression</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>A boolean expression determining if the paragraph will be rendered</sv:value>
+      </sv:property>
+      <sv:property sv:name="height" sv:type="String">
+        <sv:value>100</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Rendering rule</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-09-12T17:52:36.645+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+    <sv:node sv:name="text">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>77474442-0ff8-469b-bf76-d4062b0967ef</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>fckEdit</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Text to display</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-09-12T17:52:30.332+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-conditional.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-evaluate" 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:uuid" sv:type="String">
+    <sv:value>9d81e7ea-aa9f-4f6d-93ad-f256448d8934</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String">
+      <sv:value>MetaData</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:activatorid" sv:type="String">
+      <sv:value>superuser</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="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-15T15:44:24.547+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:title" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabEvaluate">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>f12c70da-4b71-421c-a047-053006771028</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Evaluate</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-21T09:46:53.906+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="expression">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>1f75840f-078c-465f-b2cc-c97f2f0aa1e4</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>expression</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>The expression to evaluate.</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Expression</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-21T09:46:38.093+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-evaluate.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-grid" 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:uuid" sv:type="String">
+    <sv:value>1121c87f-c169-4d3a-a66e-d49bf6efe850</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String">
+      <sv:value>MetaData</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:activatorid" sv:type="String">
+      <sv:value>superuser</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="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-15T15:44:27.495+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:title" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabGrid">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>f4c9e3e4-cd31-4ecd-862d-443c31d9aad1</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Grid</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-07-02T15:00:26.437+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="grid">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>6db4fe15-4389-4623-9ede-1a911c26a712</sv:value>
+      </sv:property>
+      <sv:property sv:name="addRowsEnabled" sv:type="String">
+        <sv:value>true</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>grid</sv:value>
+      </sv:property>
+      <sv:property sv:name="height" sv:type="String">
+        <sv:value>350</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Grid</sv:value>
+      </sv:property>
+      <sv:property sv:name="rows" sv:type="Long">
+        <sv:value>10</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-07-02T15:00:26.437+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+      <sv:node sv:name="columns">
+        <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:multiple="true">
+          <sv:value>mix:lockable</sv:value>
+        </sv:property>
+        <sv:property sv:name="jcr:uuid" sv:type="String">
+          <sv:value>1276c6d6-a65b-4150-b775-4ad8ab5bf786</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-07-02T15:01:02.937+02:00</sv:value>
+          </sv:property>
+          <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+            <sv:value>2010-07-02T15:01:07.750+02:00</sv:value>
+          </sv:property>
+        </sv:node>
+        <sv:node sv:name="00">
+          <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:multiple="true">
+            <sv:value>mix:lockable</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:uuid" sv:type="String">
+            <sv:value>6ed43ae0-5f67-4173-9091-7d32990cdf95</sv:value>
+          </sv:property>
+          <sv:property sv:name="header" sv:type="String">
+            <sv:value>Expression</sv:value>
+          </sv:property>
+          <sv:property sv:name="jcr:createdBy" sv:type="String">
+            <sv:value>admin</sv:value>
+          </sv:property>
+          <sv:property sv:name="type" sv:type="String">
+            <sv:value>expression</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-05-11T18:49:01.296+02:00</sv:value>
+            </sv:property>
+            <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+              <sv:value>2010-07-02T15:01:52.000+02:00</sv:value>
+            </sv:property>
+          </sv:node>
+        </sv:node>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-grid.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml	2013-09-15 14:29:16 UTC (rev 4306)
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="rules-samples-if-then-else" 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:uuid" sv:type="String">
+    <sv:value>130a23d1-0dce-4f58-b779-07185e93417d</sv:value>
+  </sv:property>
+  <sv:property sv:name="i18nBasename" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String">
+      <sv:value>MetaData</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:activatorid" sv:type="String">
+      <sv:value>superuser</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="String">
+      <sv:value>2004-11-02T15:34:43.213+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+      <sv:value>2008-04-28T23:43:10.557+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2013-09-15T15:44:20.006+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:title" sv:type="String">
+      <sv:value/>
+    </sv:property>
+  </sv:node>
+  <sv:node sv:name="tabIf">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>99d8de06-a2f8-4a59-bc84-f8fea5fd0fe9</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>If</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-21T09:48:59.984+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="ifCondition">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>3a32346a-76f6-4df3-b7f6-77558d610152</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>expression</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>The condition to evaluate.</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>If</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-21T09:34:23.406+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="tabThen">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>df140f3d-39c7-48bd-af2a-d5623dfc1e56</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Then</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-21T09:49:12.000+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="thenText">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>26abd0b9-1a82-4e03-a820-2d58dbdf0450</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>fckEdit</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>The text to display when condition is true.</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Then</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-21T09:47:17.812+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+  <sv:node sv:name="tabElse">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:contentNode</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:uuid" sv:type="String">
+      <sv:value>5dba476c-86ed-4119-8462-e0b8e62a6168</sv:value>
+    </sv:property>
+    <sv:property sv:name="controlType" sv:type="String">
+      <sv:value>tab</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="label" sv:type="String">
+      <sv:value>Else</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:Data" sv:type="String">
+        <sv:value>MetaData</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:activatorid" sv:type="String">
+        <sv:value>superuser</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="String">
+        <sv:value>2004-11-02T15:34:29.217+01:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+        <sv:value>2008-06-19T14:49:08.436+02:00</sv:value>
+      </sv:property>
+      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+        <sv:value>2010-05-21T09:49:30.640+02:00</sv:value>
+      </sv:property>
+    </sv:node>
+    <sv:node sv:name="elseText">
+      <sv:property sv:name="jcr:primaryType" sv:type="Name">
+        <sv:value>mgnl:contentNode</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:uuid" sv:type="String">
+        <sv:value>2e912950-f018-453a-9709-81dcaf68ea31</sv:value>
+      </sv:property>
+      <sv:property sv:name="controlType" sv:type="String">
+        <sv:value>fckEdit</sv:value>
+      </sv:property>
+      <sv:property sv:name="description" sv:type="String">
+        <sv:value>The text to display when condition is false.</sv:value>
+      </sv:property>
+      <sv:property sv:name="jcr:createdBy" sv:type="String">
+        <sv:value>admin</sv:value>
+      </sv:property>
+      <sv:property sv:name="label" sv:type="String">
+        <sv:value>Else</sv:value>
+      </sv:property>
+      <sv:property sv:name="type" sv:type="String">
+        <sv:value>String</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:Data" sv:type="String">
+          <sv:value>MetaData</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:activatorid" sv:type="String">
+          <sv:value>superuser</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="String">
+          <sv:value>2004-11-02T15:34:29.357+01:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+          <sv:value>2008-07-07T14:56:33.437+02:00</sv:value>
+        </sv:property>
+        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+          <sv:value>2010-05-21T09:48:51.421+02:00</sv:value>
+        </sv:property>
+      </sv:node>
+    </sv:node>
+  </sv:node>
+</sv:node>


Property changes on: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.rules-samples-if-then-else.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressio...
 
[truncated message content]