openutils-svn Mailing List for openutils (Page 85)

Brought to you by: fcarone, fgiust, molaschi

openutils-svn — developer list with svn commits

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (39)	Dec (10)
2007	Jan (19)	Feb (150)	Mar (10)	Apr	May (8)	Jun (11)	Jul (27)	Aug (52)	Sep (35)	Oct (30)	Nov (18)	Dec (4)
2008	Jan (76)	Feb (121)	Mar (39)	Apr (55)	May (18)	Jun (49)	Jul (32)	Aug (4)	Sep (10)	Oct	Nov (3)	Dec (33)
2009	Jan (19)	Feb (87)	Mar (69)	Apr (38)	May (47)	Jun (20)	Jul (5)	Aug (76)	Sep (145)	Oct (34)	Nov (8)	Dec (68)
2010	Jan (150)	Feb (379)	Mar (191)	Apr (100)	May (525)	Jun (269)	Jul (127)	Aug (190)	Sep (190)	Oct (29)	Nov (147)	Dec (83)
2011	Jan (188)	Feb (81)	Mar (43)	Apr (97)	May (63)	Jun (129)	Jul (17)	Aug (124)	Sep (6)	Oct (20)	Nov (67)	Dec (23)
2012	Jan (6)	Feb (14)	Mar (181)	Apr (64)	May (102)	Jun (47)	Jul (26)	Aug (3)	Sep (1)	Oct (14)	Nov (13)	Dec (23)
2013	Jan (4)	Feb (14)	Mar (18)	Apr (14)	May (27)	Jun (27)	Jul (5)	Aug (2)	Sep (74)	Oct (79)	Nov (21)	Dec (97)
2014	Jan (6)	Feb (3)	Mar (8)	Apr	May (5)	Jun	Jul (9)	Aug (6)	Sep (3)	Oct (10)	Nov (6)	Dec
2015	Jan	Feb	Mar (1)	Apr (25)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr (5)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 83 84 85 86 87 .. 227 > >> (Page 85 of 227)

[Openutils-svn] SF.net SVN: openutils:[3094] trunk/openutils-mgnlcontextmenu/pom.xml

From: <fg...@us...> - 2010-09-12 17:42:59

Revision: 3094
          http://openutils.svn.sourceforge.net/openutils/?rev=3094&view=rev
Author:   fgiust
Date:     2010-09-12 17:42:53 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-mgnlcontextmenu/pom.xml

Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:42:45 UTC (rev 3093)
+++ trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:42:53 UTC (rev 3094)
@@ -11,7 +11,7 @@
   <artifactId>openutils-mgnlcontextmenu</artifactId>
   <name>Magnolia ContextMenu Module</name>
   <description>A magnolia module for editing content via context menu</description>
-  <version>1.0.0</version>
+  <version>1.0.1-SNAPSHOT</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
     <url>http://jira.openmindlab.com/browse/MENU</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontextmenu-1.0.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontextmenu-1.0.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcontextmenu-1.0.0</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
   </scm>
   <build>
     <plugins>


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

[Openutils-svn] SF.net SVN: openutils:[3093] tags/openutils-mgnlcontextmenu-1.0.0/

From: <fg...@us...> - 2010-09-12 17:42:51

Revision: 3093
          http://openutils.svn.sourceforge.net/openutils/?rev=3093&view=rev
Author:   fgiust
Date:     2010-09-12 17:42:45 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlcontextmenu-1.0.0

Added Paths:
-----------
    tags/openutils-mgnlcontextmenu-1.0.0/


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

[Openutils-svn] SF.net SVN: openutils:[3092] trunk/openutils-mgnlcontextmenu/pom.xml

From: <fg...@us...> - 2010-09-12 17:42:31

Revision: 3092
          http://openutils.svn.sourceforge.net/openutils/?rev=3092&view=rev
Author:   fgiust
Date:     2010-09-12 17:42:24 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcontextmenu-1.0.0

Modified Paths:
--------------
    trunk/openutils-mgnlcontextmenu/pom.xml

Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:42:03 UTC (rev 3091)
+++ trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:42:24 UTC (rev 3092)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -12,7 +11,7 @@
   <artifactId>openutils-mgnlcontextmenu</artifactId>
   <name>Magnolia ContextMenu Module</name>
   <description>A magnolia module for editing content via context menu</description>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0</version>
   <inceptionYear>2010</inceptionYear>
   <licenses>
     <license>
@@ -26,9 +25,9 @@
     <url>http://jira.openmindlab.com/browse/MENU</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlcontextmenu</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontextmenu-1.0.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlcontextmenu-1.0.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlcontextmenu-1.0.0</url>
   </scm>
   <build>
     <plugins>


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

[Openutils-svn] SF.net SVN: openutils:[3091] trunk/openutils-mgnlcontextmenu/src/main/ assembly/assembly-bundle.xml

From: <fg...@us...> - 2010-09-12 17:42:09

Revision: 3091
          http://openutils.svn.sourceforge.net/openutils/?rev=3091&view=rev
Author:   fgiust
Date:     2010-09-12 17:42:03 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
don't include media module in bundle

Modified Paths:
--------------
    trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml

Modified: trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml	2010-09-12 17:37:28 UTC (rev 3090)
+++ trunk/openutils-mgnlcontextmenu/src/main/assembly/assembly-bundle.xml	2010-09-12 17:42:03 UTC (rev 3091)
@@ -26,7 +26,12 @@
     <dependencySet>
       <outputDirectory>bin</outputDirectory>
       <includes>
-        <include>net.sourceforge.openutils:*</include>
+        <include>net.sourceforge.openutils:openutils-mgnlcontextmenu</include>
+        <include>net.sourceforge.openutils:openutils-mgnlext</include>
+        <include>net.sourceforge.openutils:openutils-mgnlcontrols</include>
+        <include>net.sourceforge.openutils:openutils-mgnltasks</include>
+        <include>net.sourceforge.openutils:openutils-mgnlutils</include>
+        <include>net.sourceforge.openutils:openutils-elfunctions</include>
       </includes>
     </dependencySet>
   </dependencySets>


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

[Openutils-svn] SF.net SVN: openutils:[3090] trunk/openutils-mgnlcontextmenu/pom.xml

From: <fg...@us...> - 2010-09-12 17:37:34

Revision: 3090
          http://openutils.svn.sourceforge.net/openutils/?rev=3090&view=rev
Author:   fgiust
Date:     2010-09-12 17:37:28 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
update dependencies

Modified Paths:
--------------
    trunk/openutils-mgnlcontextmenu/pom.xml

Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:36:15 UTC (rev 3089)
+++ trunk/openutils-mgnlcontextmenu/pom.xml	2010-09-12 17:37:28 UTC (rev 3090)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -22,7 +23,7 @@
   <url>http://www.openmindlab.com/lab/products/mgnlcontextmenu.html</url>
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.openmindlab.com/browse/CONTEXTMENU</url>
+    <url>http://jira.openmindlab.com/browse/MENU</url>
   </issueManagement>
   <scm>
     <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlcontextmenu</connection>
@@ -109,12 +110,12 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
-      <version>4.0.6</version>
+      <version>4.1.1</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.6</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -124,7 +125,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlmedia</artifactId>
-      <version>4.3-b3-SNAPSHOT</version>
+      <version>4.3.0</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -167,6 +168,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.3.1</magnolia.version>
+    <magnolia.version>4.3.6</magnolia.version>
   </properties>
-</project>
+</project>
\ 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:[3089] trunk/openutils-mgnlcontextmenu/src/main/ resources

From: <fg...@us...> - 2010-09-12 17:36:21

Revision: 3089
          http://openutils.svn.sourceforge.net/openutils/?rev=3089&view=rev
Author:   fgiust
Date:     2010-09-12 17:36:15 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
change sample right click icon

Modified Paths:
--------------
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.contextMenus.default.xml
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js

Added Paths:
-----------
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/img/rightclicktoedit.png

Removed Paths:
-------------
    trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/img/right-click-to-edit.gif

Modified: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.contextMenus.default.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.contextMenus.default.xml	2010-09-12 16:12:46 UTC (rev 3088)
+++ trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.contextMenus.default.xml	2010-09-12 17:36:15 UTC (rev 3089)
@@ -16,7 +16,7 @@
     <sv:value>contextmenuOver</sv:value>
   </sv:property>
   <sv:property sv:name="mouseoverIcon" sv:type="String">
-    <sv:value>/.resources/contextmenu/img/right-click-to-edit.gif</sv:value>
+    <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</sv:value>
   </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">

Modified: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml	2010-09-12 16:12:46 UTC (rev 3088)
+++ trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml	2010-09-12 17:36:15 UTC (rev 3089)
@@ -16,7 +16,7 @@
     <sv:value>contextmenuOver</sv:value>
   </sv:property>
   <sv:property sv:name="mouseoverIcon" sv:type="String">
-    <sv:value>/.resources/contextmenu/img/right-click-to-edit.gif</sv:value>
+    <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</sv:value>
   </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">

Modified: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml	2010-09-12 16:12:46 UTC (rev 3088)
+++ trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml	2010-09-12 17:36:15 UTC (rev 3089)
@@ -16,7 +16,7 @@
     <sv:value>contextmenuOver</sv:value>
   </sv:property>
   <sv:property sv:name="mouseoverIcon" sv:type="String">
-    <sv:value>/.resources/contextmenu/img/right-click-to-edit.gif</sv:value>
+    <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</sv:value>
   </sv:property>
   <sv:node sv:name="MetaData">
     <sv:property sv:name="jcr:primaryType" sv:type="Name">

Deleted: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/img/right-click-to-edit.gif
===================================================================
(Binary files differ)

Added: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/img/rightclicktoedit.png
===================================================================
(Binary files differ)


Property changes on: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/img/rightclicktoedit.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js	2010-09-12 16:12:46 UTC (rev 3088)
+++ trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js	2010-09-12 17:36:15 UTC (rev 3089)
@@ -50,7 +50,7 @@
       var follow = jQuery('#' + followId);
       trigger.mousemove(function(e){
         if (menu.mouseoverClass) trigger.addClass(menu.mouseoverClass);
-        if (follow.length) follow.css({ display: 'block', top: e.pageY - 32, left: e.pageX - 16 });
+        if (follow.length) follow.css({ display: 'block', top: e.pageY - 80, left: e.pageX - 40 });
       });
       var fnLeave = function(){
         if (menu.mouseoverClass) trigger.removeClass(menu.mouseoverClass);
@@ -63,7 +63,7 @@
         var preventLeave;
         follow.mousemove(function(e){
           preventLeave = true;
-          follow.css({ top: e.pageY - 32, left: e.pageX - 16 });
+          follow.css({ top: e.pageY - 80, left: e.pageX - 40 });
           setTimeout(function() { preventLeave = false; }, 0);
         });
         follow.mouseleave(function(e){

Modified: trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js
===================================================================
--- trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js	2010-09-12 16:12:46 UTC (rev 3088)
+++ trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js	2010-09-12 17:36:15 UTC (rev 3089)
@@ -48,7 +48,7 @@
       var follow = document.id(followId);
       trigger.addEvent('mousemove', function(e){
         if (menu.mouseoverClass) trigger.addClass(menu.mouseoverClass);
-        if (follow) follow.setStyles({ display: 'block', top: e.page.y - 32, left: e.page.x - 16 });
+        if (follow) follow.setStyles({ display: 'block', top: e.page.y - 80, left: e.page.x - 40 });
       });
       var fnLeave = function(){
         if (menu.mouseoverClass) trigger.removeClass(menu.mouseoverClass);
@@ -63,7 +63,7 @@
         follow.addEvents({
           mousemove: function(e){
             preventLeave = true;
-            follow.setStyles({ top: e.page.y - 32, left: e.page.x - 16 });
+            follow.setStyles({ top: e.page.y - 80, left: e.page.x - 40 });
             setTimeout(function() { preventLeave = false; }, 0);
           },
           mouseleave: function(e){


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

[Openutils-svn] SF.net SVN: openutils:[3088] trunk/openutils-mgnlrules/pom.xml

From: <fg...@us...> - 2010-09-12 16:12:53

Revision: 3088
          http://openutils.svn.sourceforge.net/openutils/?rev=3088&view=rev
Author:   fgiust
Date:     2010-09-12 16:12:46 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-mgnlrules/pom.xml

Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:12:38 UTC (rev 3087)
+++ trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:12:46 UTC (rev 3088)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrules</artifactId>
   <name>Magnolia rules module</name>
-  <version>1.0.0</version>
+  <version>1.0.1-SNAPSHOT</version>
   <description>A simple rule engine integrated into Magnolia CMS</description>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrules-1.0.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrules-1.0.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlrules-1.0.0</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
   </scm>
   <build>
     <plugins>


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

[Openutils-svn] SF.net SVN: openutils:[3087] tags/openutils-mgnlrules-1.0.0/

From: <fg...@us...> - 2010-09-12 16:12:44

Revision: 3087
          http://openutils.svn.sourceforge.net/openutils/?rev=3087&view=rev
Author:   fgiust
Date:     2010-09-12 16:12:38 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlrules-1.0.0

Added Paths:
-----------
    tags/openutils-mgnlrules-1.0.0/


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

[Openutils-svn] SF.net SVN: openutils:[3086] trunk/openutils-mgnlrules/pom.xml

From: <fg...@us...> - 2010-09-12 16:12:22

Revision: 3086
          http://openutils.svn.sourceforge.net/openutils/?rev=3086&view=rev
Author:   fgiust
Date:     2010-09-12 16:12:16 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlrules-1.0.0

Modified Paths:
--------------
    trunk/openutils-mgnlrules/pom.xml

Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:11:52 UTC (rev 3085)
+++ trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:12:16 UTC (rev 3086)
@@ -10,7 +10,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlrules</artifactId>
   <name>Magnolia rules module</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>1.0.0</version>
   <description>A simple rule engine integrated into Magnolia CMS</description>
   <licenses>
     <license>
@@ -25,9 +25,9 @@
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrules-1.0.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlrules-1.0.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlrules-1.0.0</url>
   </scm>
   <build>
     <plugins>


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

[Openutils-svn] SF.net SVN: openutils:[3085] trunk/openutils-mgnlrules/pom.xml

From: <fg...@us...> - 2010-09-12 16:11:58

Revision: 3085
          http://openutils.svn.sourceforge.net/openutils/?rev=3085&view=rev
Author:   fgiust
Date:     2010-09-12 16:11:52 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
ready for a release

Modified Paths:
--------------
    trunk/openutils-mgnlrules/pom.xml

Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:10:21 UTC (rev 3084)
+++ trunk/openutils-mgnlrules/pom.xml	2010-09-12 16:11:52 UTC (rev 3085)
@@ -11,7 +11,7 @@
   <artifactId>openutils-mgnlrules</artifactId>
   <name>Magnolia rules module</name>
   <version>0.0.1-SNAPSHOT</version>
-  <description>A magnolia module for evaluating jsp rules at request time</description>
+  <description>A simple rule engine integrated into Magnolia CMS</description>
   <licenses>
     <license>
       <name>GPLv3</name>


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

[Openutils-svn] SF.net SVN: openutils:[3084] trunk/magnolia-test-webapp/src/main

From: <fg...@us...> - 2010-09-12 16:10:27

Revision: 3084
          http://openutils.svn.sourceforge.net/openutils/?rev=3084&view=rev
Author:   fgiust
Date:     2010-09-12 16:10:21 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
sort modules during development

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
    trunk/magnolia-test-webapp/src/main/resources/META-INF/
    trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/
    trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml

Removed Paths:
-------------
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/

Added: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
===================================================================
--- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java	2010-09-12 16:10:21 UTC (rev 3084)
@@ -0,0 +1,48 @@
+package info.magnolia.module.development;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.SetPropertyTask;
+import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.NodeSortTask;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * A simple version handler used to set up a few config options during development
+ * @author fgiust
+ * @version $Revision$ ($Author$)
+ */
+public class DevModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+        List<Task> tasks = new ArrayList<Task>();
+
+        boolean develop = SystemProperty.getBooleanProperty("magnolia.develop");
+
+        if (develop)
+        {
+            tasks.add(new SetPropertyTask(
+                "config",
+                "/server/activation/subscribers/magnoliaPublic8080",
+                "active",
+                "false"));
+
+        }
+
+        // I hate spending time in looking through the unsorted list of modules...
+        tasks.add(new NodeSortTask(ContentRepository.CONFIG, "/modules"));
+
+        return tasks;
+    }
+}


Property changes on: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/development/DevModuleVersionHandler.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml
===================================================================
--- trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml	2010-09-12 16:10:21 UTC (rev 3084)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd" >
+<module>
+  <name>dev</name>
+  <displayName>dev</displayName>
+  <versionHandler>info.magnolia.module.development.DevModuleVersionHandler</versionHandler>
+  <version>${project.version}</version>
+  <dependencies>
+    <dependency>
+      <name>adminInterface</name>
+      <version>1.0/*</version>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</module>
\ No newline at end of file


Property changes on: trunk/magnolia-test-webapp/src/main/resources/META-INF/magnolia/dev.xml
___________________________________________________________________
Added: svn:mime-type
   + text/xml
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

[Openutils-svn] SF.net SVN: openutils:[3083] trunk/openutils-mgnlrules/src/main/java/net/ sourceforge/openutils/mgnlrules

From: <fg...@us...> - 2010-09-12 16:08:01

Revision: 3083
          http://openutils.svn.sourceforge.net/openutils/?rev=3083&view=rev
Author:   fgiust
Date:     2010-09-12 16:07:55 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
updated headers

Modified Paths:
--------------
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2010-09-12 16:03:52 UTC (rev 3082)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2010-09-12 16:07:55 UTC (rev 3083)
@@ -1,6 +1,6 @@
 /**
  *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Magnolia rules module (http://www.openmindlab.com/lab/products/mgnlrules.html)
  * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
  *
  *  This program is free software: you can redistribute it and/or modify


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

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

From: <fg...@us...> - 2010-09-12 16:04:01

Revision: 3082
          http://openutils.svn.sourceforge.net/openutils/?rev=3082&view=rev
Author:   fgiust
Date:     2010-09-12 16:03:52 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
update samples

Modified Paths:
--------------
    trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
    trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/expressions/evaluate.jsp
    trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-expressions/paragraph-conditional.jsp
    trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-expressions/paragraph-evaluate.jsp
    trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-expressions/paragraph-if-then-else.jsp

Added Paths:
-----------
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-evaluate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-grid.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.dialogs.samples-expressions-if-then-else.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-functions.formatDate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-functions.magnoliaUser.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-functions.now.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-functions.toInt.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-libraries.samples-date.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.expression-libraries.samples-magnolia.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraph-renderers.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-evaluate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-grid.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.paragraphs.samples-expressions-if-then-else.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.rules.templates.sampleExpressions.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-rules.xml

Removed Paths:
-------------
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-evaluate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-grid.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-if-then-else.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.formatDate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.magnoliaUser.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.now.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.toInt.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-libraries.samples-date.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-libraries.samples-magnolia.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraphs.samples-expressions-conditional.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraphs.samples-expressions-evaluate.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraphs.samples-expressions-grid.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraphs.samples-expressions-if-then-else.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.templates.sampleExpressions.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/website.sample-expressions.xml

Modified: trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/META-INF/tld/mgnlexpressions.tld	2010-09-12 16:03:52 UTC (rev 3082)
@@ -8,7 +8,7 @@
   <uri>mgnlexpressions</uri>
   <function>
     <name>evaluate</name>
-    <function-class>net.sourceforge.openutils.mgnlexpressions.el.ExpressionsElFunctions</function-class>
+    <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

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-conditional.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-conditional.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-conditional.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,197 +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: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>2010-05-21T11:28:32.937+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="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="label" sv:type="String">
-        <sv:value>Render condition</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-21T11:30:18.437+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="description" sv:type="String">
-        <sv:value>The text to display.</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</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-21T11:30:48.015+02:00</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-evaluate.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-evaluate.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-evaluate.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,145 +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: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>2010-05-21T09:46:05.500+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>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-grid.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-grid.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-grid.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,222 +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: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>2010-07-02T15:00:31.031+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: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: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>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-if-then-else.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-if-then-else.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.dialogs.samples-expressions-if-then-else.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,341 +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: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>2010-05-21T09:46:09.406+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>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.formatDate.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.formatDate.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.formatDate.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="formatDate" 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>d87818a1-aa56-401c-8e90-a10c7592ccff</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodClass" sv:type="String">
-    <sv:value>org.apache.commons.lang.time.DateFormatUtils</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodName" sv:type="String">
-    <sv:value>format</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-18T10:43:18.171+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-25T15:03:45.390+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="parameterTypes">
-    <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>63f33a5a-d2ce-4c10-9f7f-e772a2757f98</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:node sv:name="MetaData">
-      <sv:property sv:name="jcr:primaryType" sv:type="Name">
-        <sv:value>mgnl:metaData</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-        <sv:value>false</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:authorid" sv:type="String">
-        <sv:value>superuser</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-        <sv:value>2010-05-18T10:46:15.265+02:00</sv:value>
-      </sv:property>
-      <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2010-05-25T14:53:25.578+02:00</sv:value>
-      </sv:property>
-    </sv:node>
-    <sv:node sv:name="0">
-      <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>d9477490-87c1-409b-929f-f5f0ec9ca7b3</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="value" sv:type="String">
-        <sv:value>java.util.Calendar</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-18T10:46:28.421+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-05-25T14:53:43.906+02:00</sv:value>
-        </sv:property>
-      </sv:node>
-    </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:value>mix:lockable</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:uuid" sv:type="String">
-        <sv:value>7cf20826-fbe3-4dfe-a581-a151da87ae49</sv:value>
-      </sv:property>
-      <sv:property sv:name="jcr:createdBy" sv:type="String">
-        <sv:value>admin</sv:value>
-      </sv:property>
-      <sv:property sv:name="value" sv:type="String">
-        <sv:value>java.lang.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: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-18T10:46:28.421+02:00</sv:value>
-        </sv:property>
-        <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2010-05-25T14:53:35.750+02:00</sv:value>
-        </sv:property>
-      </sv:node>
-    </sv:node>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.magnoliaUser.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.magnoliaUser.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.magnoliaUser.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="magnoliaUser" 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>1f0b3213-9b2b-4028-93a9-80ce21b698d3</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodClass" sv:type="String">
-    <sv:value>info.magnolia.context.MgnlContext</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodName" sv:type="String">
-    <sv:value>getUser</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-18T10:43:18.171+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-27T09:13:53.937+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.now.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.now.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.now.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="now" 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>cab86c74-2b1a-46c7-9648-bad6e90d32a0</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodClass" sv:type="String">
-    <sv:value>java.util.Calendar</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodName" sv:type="String">
-    <sv:value>getInstance</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-18T10:43:18.171+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-25T15:03:41.531+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.toInt.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.toInt.xml	2010-09-12 15:28:39 UTC (rev 3081)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.expression-functions.toInt.xml	2010-09-12 16:03:52 UTC (rev 3082)
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="toInt" 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>6beca3ff-14bf-4782-9b65-ff3745d70e36</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodClass" sv:type="String">
-    <sv:value>org.apache.commons.lang.math.NumberUtils</sv:value>
-  </sv:property>
-  <sv:property sv:name="methodName" sv:type="String">
-    <sv:value>toInt</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-18T10:43:18.171+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-25T14:55:42.796+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-  <sv:node sv:name="parameterTypes">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:content...
 
[truncated message content]

[Openutils-svn] SF.net SVN: openutils:[3081] trunk/magnolia-test-webapp/src/main/java

From: <fg...@us...> - 2010-09-12 15:28:48

Revision: 3081
          http://openutils.svn.sourceforge.net/openutils/?rev=3081&view=rev
Author:   fgiust
Date:     2010-09-12 15:28:39 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
quick patch for eclipse problems...

Added Paths:
-----------
    trunk/magnolia-test-webapp/src/main/java/info/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/
    trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/DefaultMessagesImpl.java

Added: trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/DefaultMessagesImpl.java
===================================================================
--- trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/DefaultMessagesImpl.java	                        (rev 0)
+++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/DefaultMessagesImpl.java	2010-09-12 15:28:39 UTC (rev 3081)
@@ -0,0 +1,164 @@
+// avoid NPEs when bundle can't be loaded
+/**
+ * This file Copyright (c) 2003-2010 Magnolia International
+ * Ltd.  (http://www.magnolia-cms.com). All rights reserved.
+ *
+ *
+ * This file is dual-licensed under both the Magnolia
+ * Network Agreement and the GNU General Public License.
+ * You may elect to use one or the other of these licenses.
+ *
+ * This file is distributed in the hope that it will be
+ * useful, but AS-IS and WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE, TITLE, or NONINFRINGEMENT.
+ * Redistribution, except as permitted by whichever of the GPL
+ * or MNA you select, is prohibited.
+ *
+ * 1. For the GPL license (GPL), you can redistribute and/or
+ * modify this file under the terms of the GNU General
+ * Public License, Version 3, as published by the Free Software
+ * Foundation.  You should have received a copy of the GNU
+ * General Public License, Version 3 along with this program;
+ * if not, write to the Free Software Foundation, Inc., 51
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 2. For the Magnolia Network Agreement (MNA), this file
+ * and the accompanying materials are made available under the
+ * terms of the MNA which accompanies this distribution, and
+ * is available at http://www.magnolia-cms.com/mna.html
+ *
+ * Any modifications to this file must keep this entire header
+ * intact.
+ *
+ */
+package info.magnolia.cms.i18n;
+
+import info.magnolia.cms.util.ClasspathResourcesUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.PropertyResourceBundle;
+import java.util.ResourceBundle;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author Philipp Bracher
+ * @version $Revision$ ($Author$)
+ */
+public class DefaultMessagesImpl extends AbstractMessagesImpl
+{
+
+    protected DefaultMessagesImpl(String basename, Locale locale)
+    {
+        super(basename, locale);
+    }
+
+    /**
+     * Get the message from the bundle.
+     * @param key the key
+     * @return message
+     */
+    public String get(String key)
+    {
+        if (key == null || getBundle() == null)
+        {
+            return "??????";
+        }
+        try
+        {
+            return getBundle().getString(key);
+        }
+        catch (MissingResourceException e)
+        {
+            return "???" + key + "???"; //$NON-NLS-1$ //$NON-NLS-2$
+        }
+    }
+
+    /**
+     * Returns the bundle for the current basename.
+     */
+    protected ResourceBundle getBundle()
+    {
+        if (bundle == null)
+        {
+            InputStream stream = null;
+            try
+            {
+                // TODO : isnt this what ResourceBundle does? except maybe for some ClasspathResourcesUtil magic ?
+                final String path = "/" + StringUtils.replace(basename, ".", "/");
+                final Locale locale = getLocale();
+                final Locale defaultLocale = MessagesManager.getInstance().getDefaultLocale();
+
+                stream = ClasspathResourcesUtil.getStream(path
+                    + "_"
+                    + locale.getLanguage()
+                    + "_"
+                    + locale.getCountry()
+                    + ".properties", false);
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream(path + "_" + locale.getLanguage() + ".properties", false);
+                }
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream(
+                        path + "_" + defaultLocale.getLanguage() + ".properties",
+                        false);
+                }
+                if (stream == null)
+                {
+                    stream = ClasspathResourcesUtil.getStream(path + ".properties", false);
+                }
+
+                if (stream != null)
+                {
+                    bundle = new PropertyResourceBundle(stream);
+                }
+                else
+                {
+                    bundle = ResourceBundle.getBundle(getBasename(), locale);
+                }
+            }
+            catch (IOException e)
+            {
+                log.error("can't load messages for " + basename);
+            }
+            finally
+            {
+                IOUtils.closeQuietly(stream);
+            }
+        }
+
+        if (bundle == null)
+        {
+            log.warn("Cannot load bundle for {}", basename);
+        }
+        return bundle;
+    }
+
+    public void reload() throws Exception
+    {
+        this.bundle = null;
+    }
+
+    /**
+     * Iterate over the keys.
+     */
+    public Iterator keys()
+    {
+        ResourceBundle bundle = this.getBundle();
+        if (bundle != null)
+        {
+            return IteratorUtils.asIterator(bundle.getKeys());
+        }
+        return IteratorUtils.EMPTY_ITERATOR;
+    }
+}


Property changes on: trunk/magnolia-test-webapp/src/main/java/info/magnolia/cms/i18n/DefaultMessagesImpl.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


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

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

From: <fg...@us...> - 2010-09-12 15:12:17

Revision: 3080
          http://openutils.svn.sourceforge.net/openutils/?rev=3080&view=rev
Author:   fgiust
Date:     2010-09-12 15:12:09 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
renaming

Modified Paths:
--------------
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml

Added Paths:
-----------
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java
    trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules-nooverwrite/
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/
    trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlrules/
    trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlrules/pages/

Removed Paths:
-------------
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/dialog/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/el/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/grid/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/samples/render/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java
    trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java
    trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml
    trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/expressions/
    trunk/openutils-mgnlrules/src/main/resources/net/sourceforge/openutils/mgnlexpressions/pages/

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/Expression.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/Expression.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.configuration;
+package net.sourceforge.openutils.mgnlrules.configuration;
 
 import java.util.Comparator;
 

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionFunctionManager.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionFunctionManager.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.configuration;
+package net.sourceforge.openutils.mgnlrules.configuration;
 
 import info.magnolia.cms.beans.config.ObservedManager;
 import info.magnolia.cms.core.Content;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionLibrary.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibrary.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.configuration;
+package net.sourceforge.openutils.mgnlrules.configuration;
 
 import java.util.List;
 

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/ExpressionLibraryManager.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/ExpressionLibraryManager.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.configuration;
+package net.sourceforge.openutils.mgnlrules.configuration;
 
 import info.magnolia.cms.beans.config.ObservedManager;
 import info.magnolia.cms.core.Content;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/configuration/RepositoryExpressionLibrary.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/configuration/RepositoryExpressionLibrary.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.configuration;
+package net.sourceforge.openutils.mgnlrules.configuration;
 
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.util.ContentUtil;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/dialog/ExpressionDialog.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/dialog/ExpressionDialog.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.dialog;
+package net.sourceforge.openutils.mgnlrules.dialog;
 
 import java.util.Map;
 

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/el/ExpressionsElFunctions.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/el/ExpressionsElFunctions.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.el;
+package net.sourceforge.openutils.mgnlrules.el;
 
 import info.magnolia.context.MgnlContext;
 import info.magnolia.context.WebContext;
@@ -29,7 +29,7 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 
-import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionFunctionManager;
+import net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager;
 
 import org.apache.taglibs.standard.lang.jstl.Evaluator;
 import org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/grid/ExpressionGridColumnType.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/grid/ExpressionGridColumnType.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.grid;
+package net.sourceforge.openutils.mgnlrules.grid;
 
 import info.magnolia.cms.i18n.Messages;
 import info.magnolia.context.MgnlContext;

Deleted: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/ExpressionsModule.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/ExpressionsModule.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,67 +0,0 @@
-/**
- *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
- * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlexpressions.module;
-
-import info.magnolia.module.ModuleLifecycle;
-import info.magnolia.module.ModuleLifecycleContext;
-import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionFunctionManager;
-import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibraryManager;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class ExpressionsModule implements ModuleLifecycle
-{
-
-    /**
-     * Logger.
-     */
-    private Logger log = LoggerFactory.getLogger(ExpressionsModule.class);
-
-    /**
-     * {@inheritDoc}
-     */
-    public void start(ModuleLifecycleContext moduleLifecycleContext)
-    {
-        log.info("Starting module expressions");
-
-        // Enable support for EL functions in expression editor
-        System.setProperty("javax.servlet.jsp.functions.allowed", "true");
-
-        moduleLifecycleContext.registerModuleObservingComponent("expression-libraries", ExpressionLibraryManager
-            .getInstance());
-        moduleLifecycleContext.registerModuleObservingComponent("expression-functions", ExpressionFunctionManager
-            .getInstance());
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void stop(ModuleLifecycleContext moduleLifecycleContext)
-    {
-        log.info("Stopping module expressions");
-    }
-
-}

Copied: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java (from rev 3079, trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/module/ExpressionsModule.java)
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/module/RuleModule.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,67 @@
+/**
+ *
+ * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlrules.module;
+
+import info.magnolia.module.ModuleLifecycle;
+import info.magnolia.module.ModuleLifecycleContext;
+import net.sourceforge.openutils.mgnlrules.configuration.ExpressionFunctionManager;
+import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class RuleModule implements ModuleLifecycle
+{
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(RuleModule.class);
+
+    /**
+     * {@inheritDoc}
+     */
+    public void start(ModuleLifecycleContext moduleLifecycleContext)
+    {
+        log.info("Starting module expressions");
+
+        // Enable support for EL functions in expression editor
+        System.setProperty("javax.servlet.jsp.functions.allowed", "true");
+
+        moduleLifecycleContext.registerModuleObservingComponent("expression-libraries", ExpressionLibraryManager
+            .getInstance());
+        moduleLifecycleContext.registerModuleObservingComponent("expression-functions", ExpressionFunctionManager
+            .getInstance());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void stop(ModuleLifecycleContext moduleLifecycleContext)
+    {
+        log.info("Stopping module expressions");
+    }
+
+}

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/ExpressionPicker.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionPicker.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.pages;
+package net.sourceforge.openutils.mgnlrules.pages;
 
 import info.magnolia.module.admininterface.TemplatedMVCHandler;
 
@@ -26,8 +26,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibrary;
-import net.sourceforge.openutils.mgnlexpressions.configuration.ExpressionLibraryManager;
+import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibrary;
+import net.sourceforge.openutils.mgnlrules.configuration.ExpressionLibraryManager;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/pages/ExpressionValidator.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/pages/ExpressionValidator.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.pages;
+package net.sourceforge.openutils.mgnlrules.pages;
 
 import info.magnolia.module.admininterface.TemplatedMVCHandler;
 
@@ -27,7 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import net.sourceforge.openutils.mgnlexpressions.el.ExpressionsElFunctions;
+import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/samples/render/ConditionalRenderer.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/samples/render/ConditionalRenderer.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.samples.render;
+package net.sourceforge.openutils.mgnlrules.samples.render;
 
 import info.magnolia.cms.core.Content;
 import info.magnolia.cms.util.NodeDataUtil;
@@ -28,7 +28,7 @@
 import java.io.Writer;
 import java.util.Map;
 
-import net.sourceforge.openutils.mgnlexpressions.el.ExpressionsElFunctions;
+import net.sourceforge.openutils.mgnlrules.el.ExpressionsElFunctions;
 
 
 /**

Deleted: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/ExpressionsModuleVersionHandler.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/ExpressionsModuleVersionHandler.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,79 +0,0 @@
-/**
- *
- * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
- * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlexpressions.setup;
-
-import info.magnolia.cms.core.SystemProperty;
-import info.magnolia.module.InstallContext;
-import info.magnolia.module.delta.Task;
-import it.openutils.mgnltasks.SimpleModuleVersionHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-
-
-/**
- * @author dschivo
- * @version $Id$
- */
-public class ExpressionsModuleVersionHandler extends SimpleModuleVersionHandler
-{
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected List<Task> getStartupTasks(InstallContext installContext)
-    {
-        List<Task> tasks = new ArrayList<Task>();
-
-        tasks.add(new FilesExtractionTask()
-        {
-
-            /**
-             * {@inheritDoc}
-             */
-            @Override
-            protected boolean accept(String resource)
-            {
-                return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/");
-            }
-        });
-
-        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
-        {
-            tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
-            {
-
-                /**
-                 * {@inheritDoc}
-                 */
-                @Override
-                protected boolean accept(String resource)
-                {
-                    return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/");
-                }
-            });
-        }
-
-        return tasks;
-    }
-}

Modified: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/FilesExtractionTask.java	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/FilesExtractionTask.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sourceforge.openutils.mgnlexpressions.setup;
+package net.sourceforge.openutils.mgnlrules.setup;
 
 import info.magnolia.cms.core.HierarchyManager;
 import info.magnolia.cms.core.Path;

Copied: trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java (from rev 3079, trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlexpressions/setup/ExpressionsModuleVersionHandler.java)
===================================================================
--- trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/java/net/sourceforge/openutils/mgnlrules/setup/RuleModuleVersionHandler.java	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,79 @@
+/**
+ *
+ * Magnolia expressions module (http://www.openmindlab.com/lab/products/mgnlexpressions.html)
+ * Copyright(C) 2010-2010, Openmind S.r.l. http://www.openmindonline.it
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlrules.setup;
+
+import info.magnolia.cms.core.SystemProperty;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import it.openutils.mgnltasks.SimpleModuleVersionHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class RuleModuleVersionHandler extends SimpleModuleVersionHandler
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+        List<Task> tasks = new ArrayList<Task>();
+
+        tasks.add(new FilesExtractionTask()
+        {
+
+            /**
+             * {@inheritDoc}
+             */
+            @Override
+            protected boolean accept(String resource)
+            {
+                return super.accept(resource) && StringUtils.contains(resource, "/WEB-INF/jsps/");
+            }
+        });
+
+        if (SystemProperty.getBooleanProperty(SystemProperty.MAGNOLIA_BOOTSTRAP_SAMPLES))
+        {
+            tasks.add(new FilesExtractionTask("Samples extraction", "Extracts jsp files for samples.")
+            {
+
+                /**
+                 * {@inheritDoc}
+                 */
+                @Override
+                protected boolean accept(String resource)
+                {
+                    return super.accept(resource) && StringUtils.contains(resource, "/samples-expressions/");
+                }
+            });
+        }
+
+        return tasks;
+    }
+}

Deleted: trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module SYSTEM "module.dtd">
-<module>
-  <name>expressions</name>
-  <displayName>expressions</displayName>
-  <description>Openutils - Magnolia Expressions Library</description>
-  <class>net.sourceforge.openutils.mgnlexpressions.module.ExpressionsModule</class>
-    <versionHandler>net.sourceforge.openutils.mgnlexpressions.setup.ExpressionsModuleVersionHandler</versionHandler>
-  <version>${project.version}</version>
-</module>
\ No newline at end of file

Copied: trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/expressions.xml)
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/resources/META-INF/magnolia/rules.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd">
+<module>
+  <name>rules</name>
+  <displayName>rules</displayName>
+  <description>Openutils - Magnolia Rule Module</description>
+  <class>net.sourceforge.openutils.mgnlrules.module.RuleModule</class>
+    <versionHandler>net.sourceforge.openutils.mgnlrules.setup.RuleModuleVersionHandler</versionHandler>
+  <version>${project.version}</version>
+</module>
\ No newline at end of file

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.controls.expression.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.controls.expression.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>a52c6261-148c-4d86-a3ba-0ba7d955f203</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlexpressions.dialog.ExpressionDialog</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-01-12T18:12:19.468+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-17T17:42:10.997+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.gridColumnTypes.expression.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.gridColumnTypes.expression.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>12b41f1f-ba84-45cb-9f15-c875bdacbf2a</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlexpressions.grid.ExpressionGridColumnType</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-06-18T11:41:55.562+02:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-07-02T14:55:38.921+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-picker.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-picker.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="expression-picker" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>c3145133-f1bd-4c55-b4f8-348d8d4da644</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlexpressions.pages.ExpressionPicker</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-01-12T10:35:51.750+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-18T10:36:55.375+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Deleted: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-validator.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.expressions.pages.expression-validator.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="expression-validator" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <sv:property sv:name="jcr:primaryType" sv:type="Name">
-    <sv:value>mgnl:contentNode</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
-    <sv:value>mix:lockable</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:uuid" sv:type="String">
-    <sv:value>b2ad8339-87ad-4fd1-b2df-e7008aea27a1</sv:value>
-  </sv:property>
-  <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlexpressions.pages.ExpressionValidator</sv:value>
-  </sv:property>
-  <sv:property sv:name="jcr:createdBy" sv:type="String">
-    <sv:value>admin</sv:value>
-  </sv:property>
-  <sv:node sv:name="MetaData">
-    <sv:property sv:name="jcr:primaryType" sv:type="Name">
-      <sv:value>mgnl:metaData</sv:value>
-    </sv:property>
-    <sv:property sv:name="jcr:createdBy" sv:type="String">
-      <sv:value>admin</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
-      <sv:value>false</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:authorid" sv:type="String">
-      <sv:value>superuser</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
-      <sv:value>2010-01-12T10:35:51.750+01:00</sv:value>
-    </sv:property>
-    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-      <sv:value>2010-05-18T12:43:21.343+02:00</sv:value>
-    </sv:property>
-  </sv:node>
-</sv:node>

Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.controls.expression.xml)
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.controls.expression.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>a52c6261-148c-4d86-a3ba-0ba7d955f203</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.dialog.ExpressionDialog</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-01-12T18:12:19.468+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-17T17:42:10.997+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.gridColumnTypes.expression.xml)
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.gridColumnTypes.expression.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="expression" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>12b41f1f-ba84-45cb-9f15-c875bdacbf2a</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.grid.ExpressionGridColumnType</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-06-18T11:41:55.562+02:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-07-02T14:55:38.921+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-picker.xml)
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-picker.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="expression-picker" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>c3145133-f1bd-4c55-b4f8-348d8d4da644</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.pages.ExpressionPicker</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-01-12T10:35:51.750+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-18T10:36:55.375+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Copied: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml (from rev 3079, trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/expressions/config.modules.expressions.pages.expression-validator.xml)
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml	                        (rev 0)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap/rules/config.modules.rules.pages.expression-validator.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="expression-validator" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <sv:property sv:name="jcr:primaryType" sv:type="Name">
+    <sv:value>mgnl:contentNode</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+    <sv:value>mix:lockable</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:uuid" sv:type="String">
+    <sv:value>b2ad8339-87ad-4fd1-b2df-e7008aea27a1</sv:value>
+  </sv:property>
+  <sv:property sv:name="class" sv:type="String">
+    <sv:value>net.sourceforge.openutils.mgnlrules.pages.ExpressionValidator</sv:value>
+  </sv:property>
+  <sv:property sv:name="jcr:createdBy" sv:type="String">
+    <sv:value>admin</sv:value>
+  </sv:property>
+  <sv:node sv:name="MetaData">
+    <sv:property sv:name="jcr:primaryType" sv:type="Name">
+      <sv:value>mgnl:metaData</sv:value>
+    </sv:property>
+    <sv:property sv:name="jcr:createdBy" sv:type="String">
+      <sv:value>admin</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+      <sv:value>false</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:authorid" sv:type="String">
+      <sv:value>superuser</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+      <sv:value>2010-01-12T10:35:51.750+01:00</sv:value>
+    </sv:property>
+    <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+      <sv:value>2010-05-18T12:43:21.343+02:00</sv:value>
+    </sv:property>
+  </sv:node>
+</sv:node>

Modified: trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml
===================================================================
--- trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/expressions/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml	2010-09-12 13:04:43 UTC (rev 3079)
+++ trunk/openutils-mgnlrules/src/main/resources/mgnl-bootstrap-samples/rules/config.modules.expressions.paragraph-renderers.samples-expressions-conditional.xml	2010-09-12 15:12:09 UTC (rev 3080)
@@ -10,7 +10,7 @@
     <sv:value>441881dc-85ba-4469-b56e-d150067ce491</sv:value>
   </sv:property>
   <sv:property sv:name="class" sv:type="String">
-    <sv:value>net.sourceforge.openutils.mgnlexpressions.samples.render.ConditionalRenderer</sv:value>
+    <sv:value>net.sourceforge.openutils.mgnlrules.samples.render.ConditionalRenderer</sv:value>
   </sv:property>
   <sv:property sv:name="jcr:createdBy" sv:type="String">
     <sv:value>admin</sv:value>


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

[Openutils-svn] SF.net SVN: openutils:[3079] trunk

From: <fg...@us...> - 2010-09-12 13:04:50

Revision: 3079
          http://openutils.svn.sourceforge.net/openutils/?rev=3079&view=rev
Author:   fgiust
Date:     2010-09-12 13:04:43 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
renaming expressions to rules

Modified Paths:
--------------
    trunk/magnolia-test-webapp/pom.xml
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp
    trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp
    trunk/openutils-mgnlrules/pom.xml
    trunk/pom.xml

Added Paths:
-----------
    trunk/openutils-mgnlrules/

Removed Paths:
-------------
    trunk/openutils-mgnlexpressions/

Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/pom.xml	2010-09-12 13:04:43 UTC (rev 3079)
@@ -202,7 +202,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnlexpressions</artifactId>
+      <artifactId>openutils-mgnlrules</artifactId>
       <version>0.0.1-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-ipad.jsp	2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,71 +1,67 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-	xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-	xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld">
-	<jsp:directive.page contentType="text/html; charset=UTF-8"
-		session="false" />
-	<jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" >
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <jsp:text>
     <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
-	</jsp:text>
-	<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-		<head>
-			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-			<title>${actpage.title} ipad version</title>
-			<cms:links />
-			<style type="text/css">
-				h1,h2 {
-				color: blue;
-				font-weight: bold;
-				}
-
-				body {
-				background-color: #ddf;
-				font-size: x-small;
-				}
-
-				div.ipad {
-				border: solid 1px blue;
-				margin:5px;
-
-				}
-				.ipad h3 {
-				text-decoration: underline;
-				}
-
-				.ipad > div {
-				text-align: center;
-				border-bottom: 1px solid darkBlue;
-				background-color: lightBlue;
-				color: darkBlue;
-				}
-
-				blockquote {
-				font-style: italic;
-				color:darkBlue;
-				}
-
-				.ipad p {
-				padding: 0 5px;
-				}
-
-				.ipad > p {
-				-moz-column-count:2;
-				-webkit-column-count:2;
-				column-count:2;
-				text-align:justify;
-				}
+  </jsp:text>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title} ipad version</title>
+      <cms:links />
+	<style type="text/css">
+		h1,h2 {
+			color: blue;
+			font-weight: bold;
+		}
+		
+		body {
+			background-color: #ddf;
+			font-size: x-small;
+		}
+		
+		div.ipad {
+			border: solid 1px blue;
+			margin:5px;
+			
+		}
+		.ipad h3 {
+			text-decoration: underline;
+		}
+		
+		.ipad > div {
+			text-align: center;
+			border-bottom: 1px solid darkBlue;
+			background-color: lightBlue;
+			color: darkBlue;
+		}
+		
+		blockquote {
+			font-style: italic;
+			color:darkBlue;
+		}
+		
+		.ipad p {
+			padding: 0 5px;
+		}
+		
+		.ipad > p {
+			-moz-column-count:2;
+			-webkit-column-count:2;
+			column-count:2;
+			text-align:justify;
+		}
 	</style>
-		</head>
-		<body>
-			<h1 style="">${actpage.title}</h1>
-			<p>Welcome to Magnolia Mobile Module sample page.</p>
-			<h2 style="text-decoration: blink;">iPad Version!</h2>
-			<cms:contentNodeIterator
-				contentNodeCollectionName="mobile-paragraphs">
-				<cms:includeTemplate />
-			</cms:contentNodeIterator>
-			<cms:newBar paragraph="p-sample-mobile"
-				contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
-		</body>
-	</html>
+	</head>
+    <body>
+      <h1 style="">${actpage.title}</h1>
+      <p>Welcome to Magnolia Mobile Module sample page.</p>
+      <h2 style="text-decoration: blink;">iPad Version!</h2>
+      <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+      	<cms:includeTemplate/>
+      </cms:contentNodeIterator>
+      <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+    </body>
+  </html>
 </jsp:root>
\ No newline at end of file

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index-mobile.jsp	2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,63 +1,59 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-	xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-	xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld">
-	<jsp:directive.page contentType="text/html; charset=UTF-8"
-		session="false" />
-	<jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" >
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <jsp:text>
     <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
-	</jsp:text>
-	<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-		<head>
-			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-			<title>${actpage.title} mobile version</title>
-			<cms:links />
-			<style type="text/css">
-				h1,h2 {
-				color: green;
-				font-weight: bold;
-				}
-
-				body {
-				background-color: #cde8a6;
-				font-size: x-small;
-				}
-
-				div.mobile {
-				border: solid 1px green;
-				margin:5px;
-
-				}
-				.mobile h3 {
-				text-decoration: underline;
-				}
-
-				.mobile > div {
-				text-align: center;
-				border-bottom: 1px solid darkGreen;
-				background-color: yellowGreen;
-				color: darkGreen;
-				}
-
-				blockquote {
-				font-style: italic;
-				color:darkGreen;
-				}
-
-				.mobile p {
-				padding: 0 5px;
+  </jsp:text>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title} mobile version</title>
+      <cms:links />
+	<style type="text/css">
+		h1,h2 {
+			color: green;
+			font-weight: bold;
+		}
+		
+		body {
+			background-color: #cde8a6;
+			font-size: x-small;
+		}
+		
+		div.mobile {
+			border: solid 1px green;
+			margin:5px;
+			
+		}
+		.mobile h3 {
+			text-decoration: underline;
+		}
+		
+		.mobile > div {
+			text-align: center;
+			border-bottom: 1px solid darkGreen;
+			background-color: yellowGreen;
+			color: darkGreen;
+		}
+		
+		blockquote {
+			font-style: italic;
+			color:darkGreen;
+		}
+		
+		.mobile p {
+			padding: 0 5px;
 	</style>
-		</head>
-		<body>
-			<h1 style="">${actpage.title}</h1>
-			<p>Welcome to Magnolia Mobile Module sample page.</p>
-			<h2 style="text-decoration: blink;">Mobile Version!</h2>
-			<cms:contentNodeIterator
-				contentNodeCollectionName="mobile-paragraphs">
-				<cms:includeTemplate />
-			</cms:contentNodeIterator>
-			<cms:newBar paragraph="p-sample-mobile"
-				contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
-		</body>
-	</html>
+	</head>
+    <body>
+      <h1 style="">${actpage.title}</h1>
+      <p>Welcome to Magnolia Mobile Module sample page.</p>
+      <h2 style="text-decoration: blink;">Mobile Version!</h2>
+      <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+      	<cms:includeTemplate/>
+      </cms:contentNodeIterator>
+      <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+    </body>
+  </html>
 </jsp:root>
\ No newline at end of file

Modified: trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp
===================================================================
--- trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/magnolia-test-webapp/src/main/webapp/templates/samples-mobile/index.jsp	2010-09-12 13:04:43 UTC (rev 3079)
@@ -1,31 +1,26 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page"
-	xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
-	xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
-	xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
-	xmlns:mobile="mgnlmobile">
-	<jsp:directive.page contentType="text/html; charset=UTF-8"
-		session="false" />
-	<jsp:text>
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" xmlns:cmsu="urn:jsptld:cms-util-taglib"
+  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
+  xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mobile="mgnlmobile">
+  <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+  <jsp:text>
     <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ]]>
-	</jsp:text>
-	<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
-		<head>
-			<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-			<title>${actpage.title}</title>
-			<cms:links />
-		</head>
-		<body>
-			<cms:mainBar>
-				<mobile:preview position="left" />
-			</cms:mainBar>
-			<h1>${actpage.title}</h1>
-			<p>Welcome to Magnolia Mobile Module sample page.</p>
-			<cms:contentNodeIterator
-				contentNodeCollectionName="mobile-paragraphs">
-				<cms:includeTemplate />
-			</cms:contentNodeIterator>
-			<cms:newBar paragraph="p-sample-mobile"
-				contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
-		</body>
-	</html>
+  </jsp:text>
+  <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+    <head>
+      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+      <title>${actpage.title}</title>
+      <cms:links />
+    </head>
+    <body>
+      <cms:mainBar>
+      	<mobile:preview position="left"/>
+      </cms:mainBar>
+      <h1>${actpage.title}</h1>
+      <p>Welcome to Magnolia Mobile Module sample page.</p>
+      <cms:contentNodeIterator contentNodeCollectionName="mobile-paragraphs" >
+      	<cms:includeTemplate/>
+      </cms:contentNodeIterator>
+      <cms:newBar paragraph="p-sample-mobile" contentNodeCollectionName="mobile-paragraphs"></cms:newBar>
+    </body>
+  </html>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-mgnlrules/pom.xml
===================================================================
--- trunk/openutils-mgnlexpressions/pom.xml	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/openutils-mgnlrules/pom.xml	2010-09-12 13:04:43 UTC (rev 3079)
@@ -8,26 +8,26 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
-  <artifactId>openutils-mgnlexpressions</artifactId>
-  <name>Magnolia expressions module</name>
+  <artifactId>openutils-mgnlrules</artifactId>
+  <name>Magnolia rules module</name>
   <version>0.0.1-SNAPSHOT</version>
-  <description>A magnolia module for evaluating jsp expressions at request time</description>
+  <description>A magnolia module for evaluating jsp rules at request time</description>
   <licenses>
     <license>
       <name>GPLv3</name>
       <url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
     </license>
   </licenses>
-  <url>http://www.openmindlab.com/lab/products/mgnlexpressions.html</url>
+  <url>http://www.openmindlab.com/lab/products/mgnlrules.html</url>
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.openmindlab.com/browse/EXPRESSIONS</url>
+    <url>http://jira.openmindlab.com/browse/RULES</url>
   </issueManagement>
   <inceptionYear>2010</inceptionYear>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlexpressions</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlexpressions</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlexpressions</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlrules</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlrules</url>
   </scm>
   <build>
     <plugins>
@@ -146,6 +146,6 @@
     </repository>
   </repositories>
   <properties>
-    <magnolia.version>4.3.1</magnolia.version>
+    <magnolia.version>4.3.6</magnolia.version>
   </properties>
-</project>
\ No newline at end of file
+</project>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-09-12 08:32:48 UTC (rev 3078)
+++ trunk/pom.xml	2010-09-12 13:04:43 UTC (rev 3079)
@@ -47,7 +47,7 @@
     <module>openutils-mgnlrepoutils</module>
     <module>openutils-mgnlutils</module>
     <module>openutils-mgnltagcloud</module>
-    <module>openutils-mgnlexpressions</module>
+    <module>openutils-mgnlrules</module>
     <module>openutils-mgnlcontextmenu</module>
     <module>openutils-mgnllms</module>
     <module>openutils-mgnlmobile</module>


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

[Openutils-svn] SF.net SVN: openutils:[3078] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2010-09-12 08:32:54

Revision: 3078
          http://openutils.svn.sourceforge.net/openutils/?rev=3078&view=rev
Author:   fgiust
Date:     2010-09-12 08:32:48 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:32:40 UTC (rev 3077)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:32:48 UTC (rev 3078)
@@ -9,7 +9,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>Magnolia SimpleMedia Module</name>
   <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description>
-  <version>4.3.0</version>
+  <version>4.3.1-SNAPSHOT</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -23,9 +23,9 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.3.0</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.3.0</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.3.0</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
   </scm>
   <build>
     <resources>


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

[Openutils-svn] SF.net SVN: openutils:[3077] tags/openutils-mgnlmedia-4.3.0/

From: <fg...@us...> - 2010-09-12 08:32:46

Revision: 3077
          http://openutils.svn.sourceforge.net/openutils/?rev=3077&view=rev
Author:   fgiust
Date:     2010-09-12 08:32:40 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlmedia-4.3.0

Added Paths:
-----------
    tags/openutils-mgnlmedia-4.3.0/


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

[Openutils-svn] SF.net SVN: openutils:[3076] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2010-09-12 08:32:25

Revision: 3076
          http://openutils.svn.sourceforge.net/openutils/?rev=3076&view=rev
Author:   fgiust
Date:     2010-09-12 08:32:19 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.3.0

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:29:54 UTC (rev 3075)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:32:19 UTC (rev 3076)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -10,7 +9,7 @@
   <artifactId>openutils-mgnlmedia</artifactId>
   <name>Magnolia SimpleMedia Module</name>
   <description>Magnolia SimpleMedia Module: a module for Magnolia CMS for easier management multimedia assets.</description>
-  <version>4.3-b3-SNAPSHOT</version>
+  <version>4.3.0</version>
   <inceptionYear>2008</inceptionYear>
   <licenses>
     <license>
@@ -24,9 +23,9 @@
     <url>http://jira.openmindlab.com/browse/MEDIA</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
-    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
-    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+    <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.3.0</connection>
+    <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.3.0</developerConnection>
+    <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.3.0</url>
   </scm>
   <build>
     <resources>


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

[Openutils-svn] SF.net SVN: openutils:[3075] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2010-09-12 08:30:00

Revision: 3075
          http://openutils.svn.sourceforge.net/openutils/?rev=3075&view=rev
Author:   fgiust
Date:     2010-09-12 08:29:54 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
update dependencies before a release

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:26:42 UTC (rev 3074)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:29:54 UTC (rev 3075)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>net.sourceforge.openutils</groupId>
     <artifactId>openutils-parent</artifactId>
@@ -116,7 +117,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>1.0.5</version>
+      <version>1.0.6</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -197,6 +198,17 @@
   </dependencies>
   <repositories>
     <repository>
+      <id>repository.magnolia.info</id>
+      <name>magnolia repository</name>
+      <url>http://nexus.magnolia-cms.com/content/groups/public/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
       <id>repository.openmindonline.it</id>
       <name>openmindonline repository</name>
       <url>http://repository.openmindonline.it</url>


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

[Openutils-svn] SF.net SVN: openutils:[3074] trunk/openutils-mgnlmedia/pom.xml

From: <fg...@us...> - 2010-09-12 08:26:48

Revision: 3074
          http://openutils.svn.sourceforge.net/openutils/?rev=3074&view=rev
Author:   fgiust
Date:     2010-09-12 08:26:42 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
tagcloud module not included for now

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:24:58 UTC (rev 3073)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-09-12 08:26:42 UTC (rev 3074)
@@ -145,11 +145,6 @@
       <version>3.0.2</version>
     </dependency>
     <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltagcloud</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>


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

[Openutils-svn] SF.net SVN: openutils:[3073] trunk/openutils-mgnlmedia/src/main

From: <fg...@us...> - 2010-09-12 08:25:05

Revision: 3073
          http://openutils.svn.sourceforge.net/openutils/?rev=3073&view=rev
Author:   fgiust
Date:     2010-09-12 08:24:58 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
MEDIA-176 not so stateful...

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-09-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-09-12 08:24:58 UTC (rev 3073)
@@ -230,7 +230,25 @@
         {
             itemsPerPage = module.getFolderViewItemsPerPage();
         }
-        return module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page);
+
+        AdvancedResult result = module.getSearch().search(
+            request,
+            type,
+            path,
+            false,
+            SortMode.valueOf(sorting),
+            itemsPerPage,
+            page);
+
+        // back to page 1 if an invalid page number is selected
+        if (result.getTotalSize() > 0 && result.getNumberOfPages() < page)
+        {
+            page = 1;
+        }
+
+        result = module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page);
+
+        return result;
     }
 
     /**

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js	2010-09-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js	2010-09-12 08:24:58 UTC (rev 3073)
@@ -72,6 +72,6 @@
 });
 
 mgnlTree.prototype.openFolder = function(contextPath, handle, writable) {
-	if (parent.reloadFolder) parent.reloadFolder(handle);
+	if (parent.reloadFolder) parent.reloadFolder(handle, null, true);
 }
 

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:24:58 UTC (rev 3073)
@@ -226,8 +226,9 @@
 }
 
 // reload folder content
-function reloadFolder(path, type)
+function reloadFolder(path, type, isbrowse)
 {
+
   var centerPanel = viewport.getComponent('center-panel');
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
 
@@ -235,11 +236,12 @@
   
   var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
   
-  if (url == "") {
+  if (isbrowse || url == "") {
     url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
   }
   
   querystring['path'] = path;
+
   querystring['mgnlCK'] = (new Date()).getTime();
   
   if (selectMedia)


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

[Openutils-svn] SF.net SVN: openutils:[3072] trunk/openutils-mgnlmedia/src/main/resources/ net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

From: <fg...@us...> - 2010-09-12 08:05:04

Revision: 3072
          http://openutils.svn.sourceforge.net/openutils/?rev=3072&view=rev
Author:   fgiust
Date:     2010-09-12 08:04:57 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
MEDIA-176 search results are kept after editing a media now

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 07:32:58 UTC (rev 3071)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:04:57 UTC (rev 3072)
@@ -231,28 +231,32 @@
   var centerPanel = viewport.getComponent('center-panel');
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
 
-  var url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html?path="+ path + "&mgnlCK=" + (new Date()).getTime();
+  var url = frames['mediaFolderView'].location.pathname;
+  
+  var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
+  
+  if (url == "") {
+    url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
+  }
+  
+  querystring['path'] = path;
+  querystring['mgnlCK'] = (new Date()).getTime();
+  
   if (selectMedia)
   {
-    url += "&selectMedia=true&actMediaHandle="+ actMediaHandle;
+    querystring['selectMedia'] = true;
+    querystring['actMediaHandle'] = actMediaHandle;
   }
   if (type != null && type != 'null')
   {
-    url += "&type=" + type;
+    querystring['type'] = type;
   }
   if (mediaType != null && mediaType != 'null')
   {
-    url += "&mediaType=" + mediaType;
+    querystring['mediaType'] = mediaType;
   }
-
-  var olduri = frames['mediaFolderView'].location.href.parseQueryString();
   
-  if (olduri['page'] != undefined)
-  {
-    url += "&page=" + olduri['page'];
-  }
-  
-  frames['mediaFolderView'].location.href = url;
+  frames['mediaFolderView'].location.href = url + "?" + new Hash(querystring).toQueryString();
 }
 
 function setNewMedia(uuid, thumb, 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:[3071] trunk/openutils-mgnlmedia/src/main/resources

From: <fg...@us...> - 2010-09-12 07:33:04

Revision: 3071
          http://openutils.svn.sourceforge.net/openutils/?rev=3071&view=rev
Author:   fgiust
Date:     2010-09-12 07:32:58 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
better sizing of select media windows

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background-light.png
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js

Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl	2010-09-11 18:39:27 UTC (rev 3070)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/selectMedia.ftl	2010-09-12 07:32:58 UTC (rev 3071)
@@ -20,7 +20,7 @@
     }
     [/#if]
     var selectMediaWin =
-      window.open(url, 'selectMedia', "width=800,height=500,scrollbars=no,status=yes,resizable=yes");
+      window.open(url, 'selectMedia', "width=840,height=560,scrollbars=no,status=yes,resizable=yes");
     selectMediaWin.opener = window;
   }
 

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css	2010-09-11 18:39:27 UTC (rev 3070)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css	2010-09-12 07:32:58 UTC (rev 3071)
@@ -21,12 +21,15 @@
 .tabsrow1 {
   height: 28px;
   background: #E4F5C9 url(images/toolbar-background.png) repeat-x top left;
+  overflow: hidden;
+  min-width: 400px;
 }
 
 .tabsrow2 {
   display: block;
   clear: both;
   height: 30px;
+  min-width: 400px;
 }
 
 .separator {
@@ -141,7 +144,7 @@
 
 .paging {
   border-collapse: collapse;
-  margin: 6px 20px 0 0;
+  margin: 6px 20px 4px 0;
 }
 
 .paging td {

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/images/toolbar-background-light.png
===================================================================
(Binary files differ)

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js	2010-09-11 18:39:27 UTC (rev 3070)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/MediaField.js	2010-09-12 07:32:58 UTC (rev 3071)
@@ -8,7 +8,7 @@
     window.setNewMedia = function(nodeid, uuid, file, thumb){
       this.setValue(uuid);
     }.createDelegate(this);
-    mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 800, 500);
+    mgnlOpenWindow('/.magnolia/pages/mediaBrowser.html?nodeid=' + name + '&selectMedia=true&mgnlCK=' + mgnlGetCacheKiller(), 840, 560);
   }
 
 });


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

[Openutils-svn] SF.net SVN: openutils:[3070] trunk/openutils-mgnlmedia/src/main/resources

From: <fg...@us...> - 2010-09-11 18:39:34

Revision: 3070
          http://openutils.svn.sourceforge.net/openutils/?rev=3070&view=rev
Author:   fgiust
Date:     2010-09-11 18:39:27 +0000 (Sat, 11 Sep 2010)

Log Message:
-----------
MEDIA-176 maintain the active page after editing a media

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2.4.4-more.js
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2.4.4-more.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2.4.4-more.js	2010-09-11 18:14:46 UTC (rev 3069)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mootools-1.2.4.4-more.js	2010-09-11 18:39:27 UTC (rev 3070)
@@ -2238,4 +2238,218 @@
 
 });
 
-})();
\ No newline at end of file
+})();
+
+
+/*
+---
+
+script: String.QueryString.js
+
+description: Methods for dealing with URI query strings.
+
+license: MIT-style license
+
+authors:
+- Sebastian MarkbÃ¥ge, Aaron Newton, Lennart Pilon, Valerio Proietti
+
+requires:
+- core:1.2.4/Array
+- core:1.2.4/String
+- /MooTools.More
+
+provides: [String.QueryString]
+
+...
+*/
+
+String.implement({
+
+  parseQueryString: function(){
+    var vars = this.split(/[&;]/), res = {};
+    if (vars.length) vars.each(function(val){
+      var index = val.indexOf('='),
+        keys = index < 0 ? [''] : val.substr(0, index).match(/[^\]\[]+/g),
+        value = decodeURIComponent(val.substr(index + 1)),
+        obj = res;
+      keys.each(function(key, i){
+        var current = obj[key];
+        if(i < keys.length - 1)
+          obj = obj[key] = current || {};
+        else if($type(current) == 'array')
+          current.push(value);
+        else
+          obj[key] = $defined(current) ? [current, value] : value;
+      });
+    });
+    return res;
+  },
+
+  cleanQueryString: function(method){
+    return this.split('&').filter(function(val){
+      var index = val.indexOf('='),
+      key = index < 0 ? '' : val.substr(0, index),
+      value = val.substr(index + 1);
+      return method ? method.run([key, value]) : $chk(value);
+    }).join('&');
+  }
+
+});
+
+/*
+---
+
+script: URI.js
+
+description: Provides methods useful in managing the window location and uris.
+
+license: MIT-style license
+
+authors:
+- Sebastian Markbåge
+- Aaron Newton
+
+requires:
+- core:1.2.4/Selectors
+- /String.QueryString
+
+provides: URI
+
+...
+*/
+
+var URI = new Class({
+
+  Implements: Options,
+
+  options: {
+    /*base: false*/
+  },
+
+  regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
+  parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
+  schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
+
+  initialize: function(uri, options){
+    this.setOptions(options);
+    var base = this.options.base || URI.base;
+    if(!uri) uri = base;
+    
+    if (uri && uri.parsed) this.parsed = $unlink(uri.parsed);
+    else this.set('value', uri.href || uri.toString(), base ? new URI(base) : false);
+  },
+
+  parse: function(value, base){
+    var bits = value.match(this.regex);
+    if (!bits) return false;
+    bits.shift();
+    return this.merge(bits.associate(this.parts), base);
+  },
+
+  merge: function(bits, base){
+    if ((!bits || !bits.scheme) && (!base || !base.scheme)) return false;
+    if (base){
+      this.parts.every(function(part){
+        if (bits[part]) return false;
+        bits[part] = base[part] || '';
+        return true;
+      });
+    }
+    bits.port = bits.port || this.schemes[bits.scheme.toLowerCase()];
+    bits.directory = bits.directory ? this.parseDirectory(bits.directory, base ? base.directory : '') : '/';
+    return bits;
+  },
+
+  parseDirectory: function(directory, baseDirectory) {
+    directory = (directory.substr(0, 1) == '/' ? '' : (baseDirectory || '/')) + directory;
+    if (!directory.test(URI.regs.directoryDot)) return directory;
+    var result = [];
+    directory.replace(URI.regs.endSlash, '').split('/').each(function(dir){
+      if (dir == '..' && result.length > 0) result.pop();
+      else if (dir != '.') result.push(dir);
+    });
+    return result.join('/') + '/';
+  },
+
+  combine: function(bits){
+    return bits.value || bits.scheme + '://' +
+      (bits.user ? bits.user + (bits.password ? ':' + bits.password : '') + '@' : '') +
+      (bits.host || '') + (bits.port && bits.port != this.schemes[bits.scheme] ? ':' + bits.port : '') +
+      (bits.directory || '/') + (bits.file || '') +
+      (bits.query ? '?' + bits.query : '') +
+      (bits.fragment ? '#' + bits.fragment : '');
+  },
+
+  set: function(part, value, base){
+    if (part == 'value'){
+      var scheme = value.match(URI.regs.scheme);
+      if (scheme) scheme = scheme[1];
+      if (scheme && !$defined(this.schemes[scheme.toLowerCase()])) this.parsed = { scheme: scheme, value: value };
+      else this.parsed = this.parse(value, (base || this).parsed) || (scheme ? { scheme: scheme, value: value } : { value: value });
+    } else if (part == 'data') {
+      this.setData(value);
+    } else {
+      this.parsed[part] = value;
+    }
+    return this;
+  },
+
+  get: function(part, base){
+    switch(part){
+      case 'value': return this.combine(this.parsed, base ? base.parsed : false);
+      case 'data' : return this.getData();
+    }
+    return this.parsed[part] || '';
+  },
+
+  go: function(){
+    document.location.href = this.toString();
+  },
+
+  toURI: function(){
+    return this;
+  },
+
+  getData: function(key, part){
+    var qs = this.get(part || 'query');
+    if (!$chk(qs)) return key ? null : {};
+    var obj = qs.parseQueryString();
+    return key ? obj[key] : obj;
+  },
+
+  setData: function(values, merge, part){
+    if (typeof values == 'string'){
+      data = this.getData();
+      data[arguments[0]] = arguments[1];
+      values = data;
+    } else if (merge) {
+      values = $merge(this.getData(), values);
+    }
+    return this.set(part || 'query', Hash.toQueryString(values));
+  },
+
+  clearData: function(part){
+    return this.set(part || 'query', '');
+  }
+
+});
+
+URI.prototype.toString = URI.prototype.valueOf = function(){
+  return this.get('value');
+};
+
+URI.regs = {
+  endSlash: /\/$/,
+  scheme: /^(\w+):/,
+  directoryDot: /\.\/|\.$/
+};
+
+URI.base = new URI(document.getElements('base[href]', true).getLast(), {base: document.location});
+
+String.implement({
+
+  toURI: function(options){
+    return new URI(this, options);
+  }
+
+});
\ No newline at end of file

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-11 18:14:46 UTC (rev 3069)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-11 18:39:27 UTC (rev 3070)
@@ -8,6 +8,8 @@
     <!--[if lte IE 7]>
     <link rel="stylesheet" type="text/css" href="${this.request.contextPath}/.resources/media/css/ie-fix.css" />
     <![endif]-->
+    <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2.4-core.js"></script>
+    <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2.4.4-more.js"></script>
     <script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-base.js"></script>
     <script type="text/javascript" src="${this.request.contextPath}/.resources/ext/ext-all.js"></script>
     <script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/miframe.js"></script>
@@ -242,6 +244,14 @@
   {
     url += "&mediaType=" + mediaType;
   }
+
+  var olduri = frames['mediaFolderView'].location.href.parseQueryString();
+  
+  if (olduri['page'] != undefined)
+  {
+    url += "&page=" + olduri['page'];
+  }
+  
   frames['mediaFolderView'].location.href = url;
 }
 


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

Flat | Threaded

<< < 1 .. 83 84 85 86 87 .. 227 > >> (Page 85 of 227)