openutils-svn Mailing List for openutils (Page 7)

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 .. 5 6 7 8 9 .. 227 > >> (Page 7 of 227)

[Openutils-svn] SF.net SVN: openutils:[4490] tags/openutils-mgnlext-5.0.10/

From: <fg...@us...> - 2013-12-08 20:53:40

Revision: 4490
          http://openutils.svn.sourceforge.net/openutils/?rev=4490&view=rev
Author:   fgiust
Date:     2013-12-08 20:53:38 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlext-5.0.10

Added Paths:
-----------
    tags/openutils-mgnlext-5.0.10/

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

[Openutils-svn] SF.net SVN: openutils:[4489] magnoliamodules/trunk/openutils-mgnlext/pom. xml

From: <fg...@us...> - 2013-12-08 20:53:29

Revision: 4489
          http://openutils.svn.sourceforge.net/openutils/?rev=4489&view=rev
Author:   fgiust
Date:     2013-12-08 20:53:25 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlext-5.0.10

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlext/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlext/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlext/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
+++ magnoliamodules/trunk/openutils-mgnlext/pom.xml	2013-12-08 20:53:25 UTC (rev 4489)
@@ -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,11 +9,11 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlext</artifactId>
   <name>openutils-mgnlext</name>
-  <version>5.0.10-SNAPSHOT</version>
+  <version>5.0.10</version>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlext</developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlext</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlext-5.0.10</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlext-5.0.10</developerConnection>
+    <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlext-5.0.10</url>
   </scm>
   <licenses>
     <license>

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

[Openutils-svn] SF.net SVN: openutils:[4488] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 20:52:23

Revision: 4488
          http://openutils.svn.sourceforge.net/openutils/?rev=4488&view=rev
Author:   fgiust
Date:     2013-12-08 20:52:18 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
upgrade mgnlutils version

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlcache/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnlmail/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltasks/pom.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -199,7 +199,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -110,7 +110,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -90,7 +90,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -125,7 +125,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -96,7 +96,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>struts</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -191,7 +191,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-12-08 20:52:18 UTC (rev 4488)
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
   </dependencies>
 </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:[4487] magnoliamodules/trunk/openutils-mgnlutils/pom. xml

From: <fg...@us...> - 2013-12-08 20:44:03

Revision: 4487
          http://openutils.svn.sourceforge.net/openutils/?rev=4487&view=rev
Author:   fgiust
Date:     2013-12-08 20:43:59 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:43:47 UTC (rev 4486)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:43:59 UTC (rev 4487)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlutils</artifactId>
   <name>Generic utilities for Magnolia CMS</name>
-  <version>5.0.10</version>
+  <version>5.0.11-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of Magnolia utilities and extensions</description>
   <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
@@ -24,11 +24,11 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
     </connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
     </developerConnection>
-    <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10</url>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlutils</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:[4486] tags/openutils-mgnlutils-5.0.10/

From: <fg...@us...> - 2013-12-08 20:43:50

Revision: 4486
          http://openutils.svn.sourceforge.net/openutils/?rev=4486&view=rev
Author:   fgiust
Date:     2013-12-08 20:43:47 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlutils-5.0.10

Added Paths:
-----------
    tags/openutils-mgnlutils-5.0.10/

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

[Openutils-svn] SF.net SVN: openutils:[4485] magnoliamodules/trunk/openutils-mgnlutils/pom. xml

From: <fg...@us...> - 2013-12-08 20:43:40

Revision: 4485
          http://openutils.svn.sourceforge.net/openutils/?rev=4485&view=rev
Author:   fgiust
Date:     2013-12-08 20:43:37 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlutils-5.0.10

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:43:37 UTC (rev 4485)
@@ -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 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnlutils</artifactId>
   <name>Generic utilities for Magnolia CMS</name>
-  <version>5.0.10-SNAPSHOT</version>
+  <version>5.0.10</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of Magnolia utilities and extensions</description>
   <url>http://www.openmindlab.com/lab/products/mgnlutils.html</url>
@@ -25,11 +24,11 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10
     </connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlutils
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10
     </developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnlutils</url>
+    <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlutils-5.0.10</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:[4484] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 20:39:25

Revision: 4484
          http://openutils.svn.sourceforge.net/openutils/?rev=4484&view=rev
Author:   fgiust
Date:     2013-12-08 20:39:23 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
upgrade version numbers

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnlutils/pom.xml

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/magnolia5-test-webapp/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -157,7 +157,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.11-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -163,7 +163,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -174,7 +174,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet.jsp</groupId>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -92,7 +92,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlrepoutils/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -76,7 +76,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -196,7 +196,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlutils/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
+++ magnoliamodules/trunk/openutils-mgnlutils/pom.xml	2013-12-08 20:39:23 UTC (rev 4484)
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

[Openutils-svn] SF.net SVN: openutils:[4483] magnoliamodules/trunk/openutils-mgnlcriteria/ pom.xml

From: <fg...@us...> - 2013-12-08 20:33:47

Revision: 4483
          http://openutils.svn.sourceforge.net/openutils/?rev=4483&view=rev
Author:   fgiust
Date:     2013-12-08 20:33:44 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:33:38 UTC (rev 4482)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:33:44 UTC (rev 4483)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Criteria API for Magnolia CMS</name>
-  <version>5.0.10</version>
+  <version>5.0.11-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
   <licenses>
@@ -23,9 +23,9 @@
     <url>http://jira.openmindlab.com/browse/CRIT</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.10</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.10</developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcriteria-5.0.10</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</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:[4482] tags/openutils-mgnlcriteria-5.0.10/

From: <fg...@us...> - 2013-12-08 20:33:40

Revision: 4482
          http://openutils.svn.sourceforge.net/openutils/?rev=4482&view=rev
Author:   fgiust
Date:     2013-12-08 20:33:38 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnlcriteria-5.0.10

Added Paths:
-----------
    tags/openutils-mgnlcriteria-5.0.10/

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

[Openutils-svn] SF.net SVN: openutils:[4481] magnoliamodules/trunk/openutils-mgnlcriteria/ pom.xml

From: <fg...@us...> - 2013-12-08 20:33:29

Revision: 4481
          http://openutils.svn.sourceforge.net/openutils/?rev=4481&view=rev
Author:   fgiust
Date:     2013-12-08 20:33:27 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlcriteria-5.0.10

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:31:54 UTC (rev 4480)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:33:27 UTC (rev 4481)
@@ -8,7 +8,7 @@
   </parent>
   <artifactId>openutils-mgnlcriteria</artifactId>
   <name>Criteria API for Magnolia CMS</name>
-  <version>5.0.10-SNAPSHOT</version>
+  <version>5.0.10</version>
   <inceptionYear>2009</inceptionYear>
   <description>A Hibernate's Criteria-like API to programmatically generate JCR queries with Magnolia</description>
   <licenses>
@@ -23,9 +23,9 @@
     <url>http://jira.openmindlab.com/browse/CRIT</url>
   </issueManagement>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnlcriteria</developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/magnoliamodules/trunk/openutils-mgnlcriteria</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.10</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnlcriteria-5.0.10</developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/tags/openutils-mgnlcriteria-5.0.10</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:[4480] magnoliamodules/trunk/openutils-mgnlcriteria/ pom.xml

From: <fg...@us...> - 2013-12-08 20:31:58

Revision: 4480
          http://openutils.svn.sourceforge.net/openutils/?rev=4480&view=rev
Author:   fgiust
Date:     2013-12-08 20:31:54 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
mgnltests 5.0.10

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:29:07 UTC (rev 4479)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/pom.xml	2013-12-08 20:31:54 UTC (rev 4480)
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltests</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
+      <version>5.0.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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

[Openutils-svn] SF.net SVN: openutils:[4479] magnoliamodules/trunk/openutils-mgnltests/pom. xml

From: <fg...@us...> - 2013-12-08 20:29:11

Revision: 4479
          http://openutils.svn.sourceforge.net/openutils/?rev=4479&view=rev
Author:   fgiust
Date:     2013-12-08 20:29:07 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 20:28:57 UTC (rev 4478)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 20:29:07 UTC (rev 4479)
@@ -9,7 +9,7 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltests</artifactId>
   <name>Test utilities for Magnolia CMS</name>
-  <version>5.0.10</version>
+  <version>5.0.11-SNAPSHOT</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of testing utilities for Magnolia CMS</description>
   <url>http://www.openmindlab.com/lab/products/mgnltests.html</url>
@@ -24,9 +24,9 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10 </developerConnection>
-    <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests </developerConnection>
+    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltests</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:[4478] tags/openutils-mgnltests-5.0.10/

From: <fg...@us...> - 2013-12-08 20:28:59

Revision: 4478
          http://openutils.svn.sourceforge.net/openutils/?rev=4478&view=rev
Author:   fgiust
Date:     2013-12-08 20:28:57 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin]  copy for tag openutils-mgnltests-5.0.10

Added Paths:
-----------
    tags/openutils-mgnltests-5.0.10/

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

[Openutils-svn] SF.net SVN: openutils:[4477] magnoliamodules/trunk/openutils-mgnltests/pom. xml

From: <fg...@us...> - 2013-12-08 20:28:47

Revision: 4477
          http://openutils.svn.sourceforge.net/openutils/?rev=4477&view=rev
Author:   fgiust
Date:     2013-12-08 20:28:44 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnltests-5.0.10

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 20:23:16 UTC (rev 4476)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 20:28:44 UTC (rev 4477)
@@ -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 @@
   <packaging>jar</packaging>
   <artifactId>openutils-mgnltests</artifactId>
   <name>Test utilities for Magnolia CMS</name>
-  <version>5.0.10-SNAPSHOT</version>
+  <version>5.0.10</version>
   <inceptionYear>2009</inceptionYear>
   <description>A collection of testing utilities for Magnolia CMS</description>
   <url>http://www.openmindlab.com/lab/products/mgnltests.html</url>
@@ -25,9 +24,9 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests</connection>
-    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltests </developerConnection>
-    <url>http://sourceforge.net/p/openutils/code/HEAD/tree/trunk/openutils-mgnltests</url>
+    <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10</connection>
+    <developerConnection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10 </developerConnection>
+    <url>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/tags/openutils-mgnltests-5.0.10</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:[4476] magnoliamodules/trunk/openutils-mgnllms/src/ main/java/net/sourceforge/openutils/mgnllms/filters

From: <fg...@us...> - 2013-12-08 20:23:19

Revision: 4476
          http://openutils.svn.sourceforge.net/openutils/?rev=4476&view=rev
Author:   fgiust
Date:     2013-12-08 20:23:16 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
license headers

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
    magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-12-08 20:15:30 UTC (rev 4475)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/AggregatorServingZipFilter.java	2013-12-08 20:23:16 UTC (rev 4476)
@@ -1,7 +1,7 @@
-/**  
+/**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, 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
@@ -16,7 +16,6 @@
  *  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.mgnllms.filters;
 
 import info.magnolia.cms.beans.runtime.File;

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-12-08 20:15:30 UTC (rev 4475)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/filters/RenderingServingZipFilter.java	2013-12-08 20:23:16 UTC (rev 4476)
@@ -1,7 +1,7 @@
 /**
  *
  * E-learning Module for Magnolia CMS (http://www.openmindlab.com/lab/products/lms.html)
- * Copyright(C) 2010-2011, Openmind S.r.l. http://www.openmindonline.it
+ * Copyright(C) 2010-2013, 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
@@ -16,7 +16,6 @@
  *  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.mgnllms.filters;
 
 import info.magnolia.cms.core.AggregationState;

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

[Openutils-svn] SF.net SVN: openutils:[4475] magnoliamodules/trunk/openutils-mgnlcache/src/ main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/ FSCacheManager.java

From: <fg...@us...> - 2013-12-08 20:15:33

Revision: 4475
          http://openutils.svn.sourceforge.net/openutils/?rev=4475&view=rev
Author:   fgiust
Date:     2013-12-08 20:15:30 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
hash filenames to avoid long files or invalid chars

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java

Modified: magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	2013-12-08 19:55:40 UTC (rev 4474)
+++ magnoliamodules/trunk/openutils-mgnlcache/src/main/java/net/sourceforge/openutils/mgnlsimplecache/filesystem/FSCacheManager.java	2013-12-08 20:15:30 UTC (rev 4475)
@@ -22,6 +22,7 @@
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.util.MBeanUtil;
 import info.magnolia.cms.util.ObservationUtil;
+import info.magnolia.module.files.MD5CheckingFileExtractor;
 import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.voting.Voter;
 
@@ -29,6 +30,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -42,6 +45,7 @@
 import net.sourceforge.openutils.mgnlsimplecache.managers.CacheManager;
 import net.sourceforge.openutils.mgnlsimplecache.managers.CachedItem;
 
+import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
 import org.apache.commons.io.filefilter.TrueFileFilter;
@@ -82,6 +86,8 @@
 
     private volatile boolean active = true;
 
+    private MessageDigest hashDigest;
+
     /**
      * Logger.
      */
@@ -110,6 +116,16 @@
         {
             log.error("Error registering cache MBean: " + e.getClass().getName() + " " + e.getMessage());
         }
+
+        try
+        {
+            hashDigest = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            // should never happen
+            throw new RuntimeException(e);
+        }
     }
 
     /**
@@ -310,7 +326,19 @@
                 key += "-qs-" + request.getQueryString().hashCode();
             }
         }
-        return key;
+
+        // build hash (avoid long filenames or invalid chars)
+        key = String.valueOf(Hex.encodeHex(hashDigest.digest(key.getBytes())));
+
+        // build directories with the first 4 chars
+        StringBuffer path = new StringBuffer();
+        for (int i = 0; i < 4; i++)
+        {
+            path.append(key.substring(i, i + 1)).append("/");
+        }
+        path.append(key);
+
+        return path.toString();
     }
 
     /**

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

[Openutils-svn] SF.net SVN: openutils:[4474]

From: <fg...@us...> - 2013-12-08 19:55:43

Revision: 4474
          http://openutils.svn.sourceforge.net/openutils/?rev=4474&view=rev
Author:   fgiust
Date:     2013-12-08 19:55:40 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
exclude commons-loggin

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/pom.xml
    trunk/openutils-testing4web/pom.xml

Modified: magnoliamodules/trunk/openutils-mgnltests/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 19:52:03 UTC (rev 4473)
+++ magnoliamodules/trunk/openutils-mgnltests/pom.xml	2013-12-08 19:55:40 UTC (rev 4474)
@@ -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>
@@ -113,6 +114,12 @@
       <artifactId>openutils-testing4web</artifactId>
       <version>1.2.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>info.magnolia</groupId>

Modified: trunk/openutils-testing4web/pom.xml
===================================================================
--- trunk/openutils-testing4web/pom.xml	2013-12-08 19:52:03 UTC (rev 4473)
+++ trunk/openutils-testing4web/pom.xml	2013-12-08 19:55:40 UTC (rev 4474)
@@ -126,6 +126,10 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

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

[Openutils-svn] SF.net SVN: openutils:[4473] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 19:52:08

Revision: 4473
          http://openutils.svn.sourceforge.net/openutils/?rev=4473&view=rev
Author:   fgiust
Date:     2013-12-08 19:52:03 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
cleanup sample templates

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 19:52:03 UTC (rev 4473)
@@ -189,11 +189,13 @@
       <artifactId>openutils-mgnlstruts11</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnltasks</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
+    -->
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlutils</artifactId>

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/config/default/log4j.xml	2013-12-08 19:52:03 UTC (rev 4473)
@@ -52,7 +52,7 @@
     <priority value="INFO" />
   </category>
   <category name="it.openutils.mgnlutils.el">
-    <priority value="DEBUG" />
+    <priority value="INFO" />
   </category>
   <root>
     <priority value="ALL" />

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,61 +1,64 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
-  xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mcmenu="mgnlcontextmenu">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:directive.page import="info.magnolia.cms.core.ItemType" />
   <jsp:directive.page import="info.magnolia.cms.beans.config.ContentRepository" />
   <jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.*" />
   <jsp:directive.page import="net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.*" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
+<![CDATA[
+<!DOCTYPE html>
+]]>
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
-      <cms:links />
+      <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <cms:init />
     </head>
     <body>
-      <cms:mainBar />
-      <h1>${actpage.title}</h1>
-      <p>Steps for testing this sample:</p>
-      <ol>
-        <li>
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <p>Steps for testing this sample:</p>
+        <ol>
+          <li>
           <![CDATA[make sure that AclSearchIndex has been enabled in]]>
           <![CDATA[ /magnolia-test-webapp/src/main/webapp/WEB-INF/config/repo-conf/jackrabbit-memory-search.xml]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as superuser and enter this page: all pets should be displayed]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as criteria-dogsexcluded/criteria and enter this page: dogs should not be displayed]]>
-        </li>
-        <li>
+          </li>
+          <li>
           <![CDATA[login as criteria-dogsonly/criteria and enter this page: only dogs should be displayed]]>
-        </li>
-      </ol>
-      <br />
-
-      <jsp:scriptlet><![CDATA[
+          </li>
+        </ol>
+        <br />
+        <jsp:scriptlet><![CDATA[
 Criteria criteria = JCRCriteriaFactory
   .createCriteria()
-  .setWorkspace(RepositoryConstants.WEBSITE)
+  .setWorkspace(info.magnolia.repository.RepositoryConstants.WEBSITE)
   .setBasePath("/Criteria/pets")
-  .add(Restrictions.eq("@jcr:primaryType", ItemType.CONTENT.getSystemName()))
+  .add(Restrictions.eq("@jcr:primaryType", "mgnl:page"))
   .addOrder(Order.asc("@birthDate"));
 
 AdvancedResult result = criteria.execute();
 ResultIterator<AdvancedResultItem> iterator = result.getItems();
 pageContext.setAttribute("iterator", iterator);
 ]]>
-      </jsp:scriptlet>
-      <p>Pets results:</p>
-      <ul>
-        <c:forEach var="item" items="${iterator}">
-          <li>${item.handle} (${item.title})</li>
-        </c:forEach>
-      </ul>
+        </jsp:scriptlet>
+        <p>Pets results:</p>
+        <ul>
+          <c:forEach var="item" items="${iterator}">
+            <li>${item.handle} (${item.title})</li>
+          </c:forEach>
+        </ul>
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}
@@ -50,11 +51,11 @@
             <tr>
               <th>class
               </th>
-              <td>${node.class.name}
+              <td>${node['class'].name}
               </td>
-              <td>${contentMap.class.name }
+              <td>${contentMap['class'].name }
               </td>
-              <td>${oldcontent.class.name}
+              <td>${oldcontent['class'].name}
               </td>
             </tr>
             <tr>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -13,12 +13,12 @@
   <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-      <title>${actpage.title}</title>
+      <title>${content.title}</title>
       <cms:links />
     </head>
     <body>
       <cms:mainBar />
-      <h1>${actpage.title}</h1>
+      <h1>${content.title}</h1>
       <p>Steps for testing this sample:</p>
       <ol>
         <li>

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_magnoliautils/magnoliaUtils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -15,6 +15,7 @@
       ${contextmenu:links()}
       <cms:init />
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <!-- samples css/js -->
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
     [@cms.init /]
     
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     
     <!-- samples css/js -->
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/contextmenu-samples.css" />

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/samples-controls/template-controls.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title!}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/controls/samples/css/contextmenu-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
   xmlns:lmsfn="urn:jsptld:lms-fn">
   <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"> ]]>
+    <![CDATA[<!DOCTYPE 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>
+      <title>${content.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     </head>
     <body>
       <div id="main" class="container">
         <div id="header">
-          <h1>${actpage.title}</h1>
+          <h1>${content.title}</h1>
         </div>
         <p>Click on a course in the list below. It opens a popup with the course inside</p>
         <ul>

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -4,20 +4,21 @@
   xmlns:lmsfn="urn:jsptld:lms-fn">
   <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"> ]]>
+    <![CDATA[<!DOCTYPE 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>
+      <title>${content.title}</title>
       <cms:init />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     </head>
     <body>
       <div id="main" class="container">
         <div id="header">
-          <h1>${actpage.title}</h1>
+          <h1>${content.title}</h1>
           <p>Welcome to Magnolia LMS Module sample page.</p>
           <p>The sample course repository is structured as:</p>
         </div>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/samples-media/template.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/media-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/samples-rules/template-rules.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title>${content.title!}</title>
     [@cms.init /]
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/rules/css/rules-samples.css" />
   </head>
   <body>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,24 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
-  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+  <html>
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <cms:init />
     </head>
     <body>
-      <h1>${content.title}</h1>
-      <cms:area name="main" />
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <cms:area name="main" />
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -1,19 +1,25 @@
 <jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
-  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:mu="mgnlutils"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags/openutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
-  <jsp:text>
-    <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]>
-  </jsp:text>
-  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<![CDATA[
+<!DOCTYPE html>
+]]>
+  <html>
     <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
       <title>${content.title}</title>
+      <link rel="stylesheet" type="text/css"
+        href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <cms:init />
     </head>
     <body>
-      <h1>${content.title}</h1>
-      <cms:area name="main" />
+      <div id="main" class="container">
+        <h1>${content.title}</h1>
+        <cms:area name="main" />
+      </div>
     </body>
   </html>
 </jsp:root>
\ No newline at end of file

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title>${content.title}</title>
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <link rel="stylesheet" type="text/css"
         href="${pageContext.request.contextPath}/.resources/tagcloud/samples/css/tagcloud-samples.css" />
     </head>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-files/samples/sample-magnoliautils.jsp	2013-12-08 19:52:03 UTC (rev 4473)
@@ -12,6 +12,7 @@
       <title> ${content.title}
       </title>
       <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+      <meta name="viewport" content="width=device-width, initial-scale=1.0" />
       <style>
     <![CDATA[
       code { display: block}
@@ -27,6 +28,10 @@
         <c:set var="oldcontent" value="${state.currentContent}" />
         <c:set var="contentMap" value="${content}" />
         <c:set var="node" value="${oldcontent.JCRNode}" />
+        <p>
+        You can now use javax.jcr.Node objects directly into jsps. Also ContentMap or old Content and NodeMapWrapper are
+        handled, so you can use the same set of properties for any of them.
+        </p>
         <table class="table table-striped table-bordered table-hover">
           <thead>
             <tr>
@@ -50,11 +55,11 @@
             <tr>
               <th>class
               </th>
-              <td>${node.class.name}
+              <td>${node['class'].name}
               </td>
-              <td>${contentMap.class.name }
+              <td>${contentMap['class'].name }
               </td>
-              <td>${oldcontent.class.name}
+              <td>${oldcontent['class'].name}
               </td>
             </tr>
             <tr>

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl	2013-12-08 19:25:48 UTC (rev 4472)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/samples-utils/sample-magnoliautils.ftl	2013-12-08 19:52:03 UTC (rev 4473)
@@ -5,6 +5,7 @@
     <title> ${content.title}
     </title>
     <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/bootstrap/3.0/css/bootstrap.min.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <style>
     <![CDATA[
       code { display: block}

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

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

From: <fg...@us...> - 2013-12-08 19:25:51

Revision: 4472
          http://openutils.svn.sourceforge.net/openutils/?rev=4472&view=rev
Author:   fgiust
Date:     2013-12-08 19:25:48 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
cleanup samples

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 19:16:08 UTC (rev 4471)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 19:25:48 UTC (rev 4472)
@@ -56,7 +56,7 @@
     <c:set var="width" value="320" />
   </c:if>
   <c:if test="${empty height or height eq 0}">
-    <c:set var="height" value="${media.type eq 'audio' ? 20 : 240}" />
+    <c:set var="height" value="${mediaNode.type eq 'audio' ? 20 : 240}" />
   </c:if>
   <c:set var="previewwidth" value="${width}" />
   <c:set var="previewheight" value="${height}" />

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml	2013-12-08 19:16:08 UTC (rev 4471)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap-samples/media/website.sample-simplemedia.xml	2013-12-08 19:25:48 UTC (rev 4472)
@@ -534,7 +534,7 @@
         <sv:value>2011-07-01T17:59:08.549+02:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-        <sv:value>2012-04-10T10:25:48.212+02:00</sv:value>
+        <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
       </sv:property>
       <sv:property sv:name="mgnl:template" sv:type="String">
         <sv:value>media:pages/sampleSimpleMedia</sv:value>
@@ -567,7 +567,7 @@
           <sv:value>2011-07-01T17:59:47.625+02:00</sv:value>
         </sv:property>
         <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-          <sv:value>2011-11-20T21:20:30.927+01:00</sv:value>
+          <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
         </sv:property>
       </sv:node>
       <sv:node sv:name="00">
@@ -584,7 +584,7 @@
           <sv:value>admin</sv:value>
         </sv:property>
         <sv:property sv:name="media" sv:type="String">
-          <sv:value>41f81027-183f-4860-9d88-fcc3a6c5ce05</sv:value>
+          <sv:value>d7bfa8ee-7f0c-4400-8e38-8ab1a9de6e5a</sv:value>
         </sv:property>
         <sv:node sv:name="MetaData">
           <sv:property sv:name="jcr:primaryType" sv:type="Name">
@@ -600,7 +600,7 @@
             <sv:value>2011-07-01T18:00:01.154+02:00</sv:value>
           </sv:property>
           <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
-            <sv:value>2011-11-20T21:20:30.927+01:00</sv:value>
+            <sv:value>2013-12-08T20:24:13.740+01:00</sv:value>
           </sv:property>
           <sv:property sv:name="mgnl:template" sv:type="String">
             <sv:value>media:components/samples-mediatag</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:[4471] trunk/openutils-testing4web/src/test/resources /jsps

From: <fg...@us...> - 2013-12-08 19:16:11

Revision: 4471
          http://openutils.svn.sourceforge.net/openutils/?rev=4471&view=rev
Author:   fgiust
Date:     2013-12-08 19:16:08 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)

Modified Paths:
--------------
    trunk/openutils-testing4web/src/test/resources/jsps/simple.jsp
    trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.jsp

Modified: trunk/openutils-testing4web/src/test/resources/jsps/simple.jsp
===================================================================
--- trunk/openutils-testing4web/src/test/resources/jsps/simple.jsp	2013-12-08 19:16:02 UTC (rev 4470)
+++ trunk/openutils-testing4web/src/test/resources/jsps/simple.jsp	2013-12-08 19:16:08 UTC (rev 4471)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page">
   <jsp:text>jsp output</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.jsp
===================================================================
--- trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.jsp	2013-12-08 19:16:02 UTC (rev 4470)
+++ trunk/openutils-testing4web/src/test/resources/jsps/withtaglib.jsp	2013-12-08 19:16:08 UTC (rev 4471)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sample="sample">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:sample="sample">
   <jsp:text>${sample:sampleFunction()}</jsp:text>
 </jsp:root>
\ 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:[4470] trunk/openutils-elfunctions/src/test/resources /jsps

From: <fg...@us...> - 2013-12-08 19:16:05

Revision: 4470
          http://openutils.svn.sourceforge.net/openutils/?rev=4470&view=rev
Author:   fgiust
Date:     2013-12-08 19:16:02 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)

Modified Paths:
--------------
    trunk/openutils-elfunctions/src/test/resources/jsps/adaptStringLength.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/currentDateIncluded.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/defaultIfEmpty.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/endsWith.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/entryset.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/escJsTxt.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/formatDate.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTime.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTimeWithLocale.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/formatTime.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/isBlank.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/isNumber.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/newline.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/paginateCollection.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/parseDate.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/shorten.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/shuffle.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/space.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/splitNewlines.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/splitOnTabs.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/strip.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/stripHtmlTags.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/substringAfterLast.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/substringBeforeLast.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/tab.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/toCeilLong.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/toFloorLong.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/toList.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/toLong.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/toRoundedLong.jsp
    trunk/openutils-elfunctions/src/test/resources/jsps/unescapeXml.jsp

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/adaptStringLength.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/adaptStringLength.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/adaptStringLength.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
   <jsp:text>${su:adaptStringLength("pre",2,"post")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:capitaliseAllWords("test one two")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/currentDateIncluded.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/currentDateIncluded.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/currentDateIncluded.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet><![CDATA[
 Calendar now = Calendar.getInstance();

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/defaultIfEmpty.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/defaultIfEmpty.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/defaultIfEmpty.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:defaultIfEmpty(null, "NULL")} ${su:defaultIfEmpty("", "NULL")} ${su:defaultIfEmpty("bat", "NULL")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/endsWith.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/endsWith.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/endsWith.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:endsWith("otherString","String")} ${su:endsWith("otherString","xyz")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/entryset.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/entryset.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/entryset.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
   <jsp:directive.page import="java.util.HashMap" />
   <jsp:directive.page import="java.util.Map" />
   <jsp:scriptlet><![CDATA[

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/escJsTxt.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/escJsTxt.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/escJsTxt.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:escJsTxt("xyz\\23",true)} ${su:escJsTxt("xyz\\23",false)}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatDate.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatDate.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatDate.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatDate(datadefault,"short","it")} ${du:formatDate(datadefault,"long","it")} ${du:formatDate(datadefault,"full","it")}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTime.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTime.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTime.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatDateTime(datadefault,'d/MM/y','it')}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTimeWithLocale.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTimeWithLocale.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatDateTimeWithLocale.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2,12,37);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatDateTimeWithLocale(datadefault,'it','d/MM/y-h:mm')}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatInterval.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2,12,45,22);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatInterval(63076234017000)}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/formatTime.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/formatTime.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/formatTime.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2,12,45,22);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatTime(datadefault,'hh:mm-ss','it')} ${du:formatTime(datadefault,'short','it')} ${du:formatTime(datadefault,'long','it')}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/isBlank.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/isBlank.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/isBlank.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:isBlank("test")} ${su:isBlank("")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/isNumber.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/isNumber.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/isNumber.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
   <jsp:text>${su:isNumber('4')} ${su:isNumber('test')}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/newline.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/newline.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/newline.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:text><c:set var="stringtoevaluate">frist row${su:newline()}secondrow</c:set>${su:splitNewlines(stringtoevaluate)[1]}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/paginateCollection.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/paginateCollection.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/paginateCollection.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
   <jsp:directive.page import="java.util.ArrayList" />
   <jsp:directive.page import="java.util.List" />
   <jsp:scriptlet><![CDATA[

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/parseDate.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/parseDate.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/parseDate.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils" >
    <jsp:directive.page import="java.util.Calendar" />
    <jsp:scriptlet>Calendar datadefault = Calendar.getInstance(); datadefault.set(11,03,2,12,45,22);request.setAttribute("datadefault", datadefault);</jsp:scriptlet>
   <jsp:text>${du:formatDate(du:parseDate("22/10/10","d/m/y"),"short","it")}</jsp:text>

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/shorten.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/shorten.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/shorten.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:shorten("text to be shorten",1,3,"...")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/shuffle.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/shuffle.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/shuffle.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
   <jsp:directive.page import="java.util.ArrayList" />
   <jsp:directive.page import="java.util.List" />
   <jsp:scriptlet><![CDATA[

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/space.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/space.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/space.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:space()}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/splitNewlines.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/splitNewlines.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/splitNewlines.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:text><c:set var="stringtoevaluate">frist row${su:newline()}secondrow</c:set>${su:splitNewlines(stringtoevaluate)[1]}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/splitOnTabs.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/splitOnTabs.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/splitOnTabs.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:text><c:set var="stringtoevaluate">frist tab${su:tab()}second tab</c:set>${su:splitOnTabs(stringtoevaluate)[1]}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/strip.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/strip.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/strip.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:strip(" strip ")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/stripHtmlTags.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/stripHtmlTags.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/stripHtmlTags.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils" >
   <jsp:text><![CDATA[${su:stripHtmlTags("<strong>test</strong>")}]]></jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/substringAfterLast.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/substringAfterLast.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/substringAfterLast.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:substringAfterLast("test|xyz","|")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/substringBeforeLast.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/substringBeforeLast.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/substringBeforeLast.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:substringBeforeLast("test|xyz","|")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/tab.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/tab.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/tab.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils"  xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:text><c:set var="stringtoevaluate">frist tab${su:tab()}second tab</c:set>${su:splitOnTabs(stringtoevaluate)[1]}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/toCeilLong.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/toCeilLong.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/toCeilLong.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:toCeilLong("27.5")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/toFloorLong.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/toFloorLong.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/toFloorLong.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:toFloorLong("27.5")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/toList.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/toList.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/toList.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cu="collectionutils">
   <jsp:scriptlet><![CDATA[
 String[] array = { "hello", "world" };
 pageContext.setAttribute("array", array);

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/toLong.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/toLong.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/toLong.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:toLong("27")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/toRoundedLong.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/toRoundedLong.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/toRoundedLong.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:toRoundedLong("27.5")}</jsp:text>
 </jsp:root>
\ No newline at end of file

Modified: trunk/openutils-elfunctions/src/test/resources/jsps/unescapeXml.jsp
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/unescapeXml.jsp	2013-12-08 19:15:25 UTC (rev 4469)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/unescapeXml.jsp	2013-12-08 19:16:02 UTC (rev 4470)
@@ -1,3 +1,3 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:text>${su:unescapeXml("t&#32;est &#33;")}</jsp:text>
 </jsp:root>
\ 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:[4469] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 19:15:28

Revision: 4469
          http://openutils.svn.sourceforge.net/openutils/?rev=4469&view=rev
Author:   fgiust
Date:     2013-12-08 19:15:25 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
    magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp

Property Changed:
----------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
   xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:directive.page import="java.util.Calendar" />

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/docroot/elfunction-test.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <html xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:fo="http://www.w3.org/1999/XSL/Format">

Modified: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
   xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mcmenu="mgnlcontextmenu">

Index: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates	2013-12-08 19:15:25 UTC (rev 4469)

Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates
___________________________________________________________________
Modified: svn:ignore
## -8,3 +8,4 ##
 samples-struts11
 samples-rules
 samples-tagcloud
+samples-lms
Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/jsps/expressions/evaluate.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
   xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mexpr="mgnlexpressions">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="true" />

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/WEB-INF/tags/openutils/debug.tag	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mgnl="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:su="http://openutils.sf.net/openutils-stringutils"
   xmlns:mu="mgnlutils" xmlns:du="dateutils" xmlns:el="project">

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/dateutils-test.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:du="dateutils"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <jsp:directive.page import="java.util.Calendar" />

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/docroot/elfunction-test.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:su="urn:jsptld:http://openutils.sf.net/openutils-stringutils"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   <html xmlns:javaee="http://java.sun.com/xml/ns/javaee" xmlns:fo="http://www.w3.org/1999/XSL/Format">

Modified: magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp
===================================================================
--- magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:15:15 UTC (rev 4468)
+++ magnoliamodules/trunk/magnolia5-test-webapp/src/main/webapp/template_criteria/criteria.jsp	2013-12-08 19:15:25 UTC (rev 4469)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
   xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mcmenu="mgnlcontextmenu">

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

[Openutils-svn] SF.net SVN: openutils:[4468] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 19:15:19

Revision: 4468
          http://openutils.svn.sourceforge.net/openutils/?rev=4468&view=rev
Author:   fgiust
Date:     2013-12-08 19:15:15 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
update jsp declarations to use jsp 2.1 (tomcat6+)

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
    magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
    magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
    magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
    magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp
    magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
    magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag
    magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:contextmenu="http://openutils/mgnlcontextmenu">

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/META-INF/tags/playerUrl.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:lmsfn="urn:jsptld:lms-fn">
   <jsp:directive.attribute name="course" required="true" rtexprvalue="true"

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/courses.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:lmsfn="urn:jsptld:lms-fn">

Modified: magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnllms/src/main/resources/mgnl-files/templates/samples-lms/index.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:lmsfn="urn:jsptld:lms-fn">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/imageTag.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
   xmlns:image="urn:jsptld:http://it.openmindonline/imageTag">
   <!--

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">
@@ -74,12 +74,11 @@
   <c:set value="${media:node(item)}" var="mediaNode" />
   <c:choose>
     <c:when test="${!empty mediaNode}">
-      <c:set var="media" value="${media:node(mediaNode)}" />
       <c:choose>
-        <c:when test="${crop and (media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview)}">
+        <c:when test="${crop and (mediaNode.type eq 'image' or mediaNode.type eq 'wallpaper' or videoImagePreview)}">
           <media:crop item="${media}" width="${width}" height="${height}" property="${cropProperty}" jquery="${cropJquery}" jqueryui="${cropJqueryUI}" loadjs="${cropJs}" />
         </c:when>
-        <c:when test="${media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview}">
+        <c:when test="${mediaNode.type eq 'image' or mediaNode.type eq 'wallpaper' or videoImagePreview}">
           <c:choose>
             <c:when test="${width eq 0 and height eq 0}">
               <c:set var="url" value="${media:url(mediaNode)}" />
@@ -145,7 +144,7 @@
             <![CDATA[ />]]>
           </c:if>
         </c:when>
-        <c:when test="${media.type eq 'video' or media.type eq 'audio' or media.type eq 'youtube' }">
+        <c:when test="${mediaNode.type eq 'video' or mediaNode.type eq 'audio' or mediaNode.type eq 'youtube' }">
           <c:set var="url" value="${media:url(mediaNode)}"/>
           
           
@@ -183,7 +182,7 @@
           
          
         </c:when>
-        <c:when test="${media.type eq 'swf' }">
+        <c:when test="${mediaNode.type eq 'swf' }">
         
           <c:if test="${!(width gt 0)}">
             <c:set var="width" value="${media:width(mediaNode)}" />

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-grid.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediael.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-playlist.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils">

Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
   xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
   xmlns:su="http://openutils.sf.net/openutils-stringutils" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mu="mgnlutils"

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/WEB-INF/jsps/rules/evaluate.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils" xmlns:rules="mgnlrules">

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-conditional.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils" xmlns:rules="mgnlrules">

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-evaluate.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils" xmlns:rules="mgnlrules">

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-grid.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils" xmlns:rules="mgnlrules">

Modified: magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlrules/src/main/resources/mgnl-files/templates/samples-rules/paragraph-if-then-else.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
   xmlns:mu="mgnlutils" xmlns:rules="mgnlrules">

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/area.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/paragraph.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstripes/src/main/resources/mgnl-files/templates/samples-stripes/template.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/area.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/paragraph.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/src/main/resources/mgnl-files/templates/samples-struts11/template.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/META-INF/tags/tagcloud/tagcloud.tag	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
   xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud"
   xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt">
   <jsp:directive.attribute name="name" required="false" rtexprvalue="true" />

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/main/resources/mgnl-files/templates/samples-tagcloud/template.jsp	2013-12-08 19:15:15 UTC (rev 4468)
@@ -1,4 +1,4 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
   xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
   xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:tagcloud="http://net.sourceforge.openutils/mgnlTagCloud"
   xmlns:su="http://openutils.sf.net/openutils-stringutils">

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java	2013-12-08 19:15:15 UTC (rev 4468)
@@ -28,8 +28,8 @@
 import javax.el.ELException;
 import javax.el.ELResolver;
 import javax.el.PropertyNotWritableException;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.PageContext;
 
 import org.apache.commons.lang.ObjectUtils;
 import org.slf4j.Logger;
@@ -65,7 +65,8 @@
     @Override
     public Object getValue(ELContext elContext, Object base, Object property) throws ELException
     {
-        if (base == null)
+        if (base == null
+            && ((PageContext) elContext.getContext(JspContext.class)).findAttribute(ObjectUtils.toString(property)) == null)
         {
             Object result = beans.get(ObjectUtils.toString(property));
             if (result != null)
@@ -80,13 +81,14 @@
     @Override
     public Class< ? > getType(ELContext elContext, Object base, Object property) throws ELException
     {
-        if (base == null)
+        if (base == null
+            && ((PageContext) elContext.getContext(JspContext.class)).findAttribute(ObjectUtils.toString(property)) == null)
         {
             Object result = beans.get(ObjectUtils.toString(property));
             if (result != null)
             {
                 elContext.setPropertyResolved(true);
-                result.getClass();
+                return result.getClass();
             }
         }
         return null;

Modified: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java	2013-12-08 16:44:17 UTC (rev 4467)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java	2013-12-08 19:15:15 UTC (rev 4468)
@@ -19,8 +19,10 @@
 
 package it.openutils.mgnlutils.setup;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import freemarker.ext.beans.BeanModel;
 import freemarker.template.TemplateModel;
 import info.magnolia.freemarker.FreemarkerConfig;
 import info.magnolia.module.ModuleLifecycle;
@@ -66,10 +68,17 @@
             {
                 Map<String, TemplateModel> sharedVariables = freemarkerConfig.getSharedVariables();
 
+                Map<String, Object> plainBeans = new HashMap<String, Object>();
+                for (Map.Entry<String, TemplateModel> var : sharedVariables.entrySet())
+                {
+                    plainBeans.put(var.getKey(), ((BeanModel) var.getValue()).getWrappedObject());
+                }
+
+                // getWrappedObject
                 JspFactory
                     .getDefaultFactory()
                     .getJspApplicationContext(servletContext)
-                    .addELResolver(new BenExposingELResolver(sharedVariables));
+                    .addELResolver(new BenExposingELResolver(plainBeans));
             }
 
         }

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

[Openutils-svn] SF.net SVN: openutils:[4467] magnoliamodules/trunk

From: <fg...@us...> - 2013-12-08 16:44:22

Revision: 4467
          http://openutils.svn.sourceforge.net/openutils/?rev=4467&view=rev
Author:   fgiust
Date:     2013-12-08 16:44:17 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
merge mgnltasks into mgnlutils

Modified Paths:
--------------
    magnoliamodules/trunk/magnolia-test-webapp/pom.xml
    magnoliamodules/trunk/openutils-mgnlcache/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
    magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
    magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
    magnoliamodules/trunk/openutils-mgnllms/pom.xml
    magnoliamodules/trunk/openutils-mgnlmail/pom.xml
    magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
    magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
    magnoliamodules/trunk/openutils-mgnlrules/pom.xml
    magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
    magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
    magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
    magnoliamodules/trunk/openutils-mgnltasks/pom.xml
    magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/dev/ModuleDevelopmentUtilsPage.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctions.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModule.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/setup/MgnlUtilsModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/META-INF/magnolia/mgnlutils.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.mu.xml

Added Paths:
-----------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/
    magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateRoleTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateUserTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckMissingParagraphsTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckMissingTemplatesTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ConditionalBootstrapResource.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ConditionalTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CreateDefaultRepositoryAclForAllUsersTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CreateMissingPropertyTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DeleteNodeTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DiffModuleConfigBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DiffSimpleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DirectoryBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/DisableSubscribersTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ExistenceConditionalBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/FilesExtractionTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ModuleConfigBootstrapTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/MoveSubnodesAndDeleteTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/NodeSortTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ReplaceParagraphTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ReplaceTemplateTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SamplesExtractionTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SetNodeOrderTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SetPropertyTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/SimpleModuleVersionHandler.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/UpdateModuleVersionTask.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/dev/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnlutils/el/BenExposingELResolver.java
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/mgnltasks/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/it/openutils/mgnltasks/dev/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils/
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.du.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-bootstrap/mgnlutils-nooverwrite/config.server.rendering.freemarker.sharedVariables.su.xml
    magnoliamodules/trunk/openutils-mgnlutils/src/main/resources/mgnl-resources/tasks/

Removed Paths:
-------------
    magnoliamodules/trunk/magnolia-test-webapp/src/main/webapp/templates/samples-lms/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/it/
    magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/mgnl-resources/tasks/

Modified: magnoliamodules/trunk/magnolia-test-webapp/pom.xml
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/magnolia-test-webapp/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -219,11 +219,6 @@
       <artifactId>openutils-mgnllms</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnlvanityurl</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>

Added: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
===================================================================
--- magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java	                        (rev 0)
+++ magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,47 @@
+/**
+ *
+ * Magnolia test webapp (http://openutils.sourceforge.net/magnolia-test-webapp)
+ * Copyright(C) 2009-2013, 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.demo;
+
+import info.magnolia.repository.RepositoryConstants;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlUtilsDemoFunctions
+{
+
+    public static AdvancedResult find(String value)
+    {
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(RepositoryConstants.WEBSITE)
+            .add(Restrictions.hasNodeType("mgnl:page"))
+            .add(Restrictions.contains(".", value))
+            .addOrderByScore();
+
+        return criteria.execute();
+    }
+
+}


Property changes on: magnoliamodules/trunk/magnolia-test-webapp/src/main/java/net/sourceforge/openutils/demo/MgnlUtilsDemoFunctions.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcache/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcache/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -60,7 +60,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -114,11 +114,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-elfunctions</artifactId>
       <version>1.1.1</version>
     </dependency>

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -91,11 +91,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>

Modified: magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlgroovy/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnllms/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnllms/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -107,7 +107,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmail/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmail/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -97,7 +97,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmedia/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -114,11 +114,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>

Modified: magnoliamodules/trunk/openutils-mgnlmessages/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlmessages/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -86,11 +86,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlext</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>

Modified: magnoliamodules/trunk/openutils-mgnlrules/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlrules/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -104,7 +104,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlstripes/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlstripes/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnlstruts11/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -95,7 +95,7 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
+      <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -185,11 +185,6 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnltasks</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-mgnlcontrols</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>

Modified: magnoliamodules/trunk/openutils-mgnltasks/pom.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltasks/pom.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -12,7 +12,7 @@
   <artifactId>openutils-mgnltasks</artifactId>
   <name>Tasks for for Magnolia CMS</name>
   <version>5.0.10-SNAPSHOT</version>
-  <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+  <description>A collection of useful magnolia update tasks that can be reused in custom modules (transitional module, merged into mgnlutils)</description>
   <inceptionYear>2008</inceptionYear>
   <scm>
     <connection>scm:svn:svn+ssh://svn.code.sf.net/p/openutils/code/magnoliamodules/trunk/openutils-mgnltasks</connection>
@@ -73,60 +73,5 @@
       <artifactId>openutils-mgnlutils</artifactId>
       <version>5.0.10-SNAPSHOT</version>
     </dependency>
-    <dependency>
-      <groupId>net.sourceforge.openutils</groupId>
-      <artifactId>openutils-mgnlcriteria</artifactId>
-      <version>5.0.10-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-core</artifactId>
-      <version>${magnolia.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>servlets.com</groupId>
-          <artifactId>cos</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>info.magnolia</groupId>
-      <artifactId>magnolia-module-admininterface</artifactId>
-      <version>${magnolia.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>servlets.com</groupId>
-          <artifactId>cos</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <classifier>jdk15</classifier>
-      <version>5.7</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
   </dependencies>
-  <properties>
-    <magnolia.version>4.5.11</magnolia.version>
-  </properties>
 </project>
\ No newline at end of file

Added: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,67 @@
+/**
+ *
+ * Tasks for for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnltasks.html)
+ * Copyright(C) 2008-2013, 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 it.openutils.legacymgnltasks;
+
+import info.magnolia.module.DefaultModuleVersionHandler;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public class MgnlTasksModuleVersionHandler extends DefaultModuleVersionHandler
+{
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected List<Task> getStartupTasks(InstallContext installContext)
+    {
+        List<Task> tasks = new ArrayList<Task>();
+        tasks.add(new Task()
+        {
+
+            public void execute(InstallContext installContext) throws TaskExecutionException
+            {
+                installContext
+                    .warn("Tasks module is deprecated. Since version 5.0.10 has been merged into mgnlutils, you can freely remove this module");
+            }
+
+            public String getName()
+            {
+                return "Tasks module deprecation warning";
+            }
+
+            public String getDescription()
+            {
+                return "Tasks module deprecation warning";
+            }
+        });
+
+        return tasks;
+    }
+
+}


Property changes on: magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/legacymgnltasks/MgnlTasksModuleVersionHandler.java
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Revision
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml	2013-12-08 13:12:40 UTC (rev 4466)
+++ magnoliamodules/trunk/openutils-mgnltasks/src/main/resources/META-INF/magnolia/tasks.xml	2013-12-08 16:44:17 UTC (rev 4467)
@@ -2,17 +2,14 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 <module>
   <name>tasks</name>
-  <displayName>Openutils magnolia tasks</displayName>
-  <description>A collection of useful magnolia update tasks that can be reused in custom modules</description>
+  <displayName>tasks (transitional module, merged into mgnlutils)</displayName>
+  <description>tasks (transitional module, merged into mgnlutils)</description>
+  <versionHandler>it.openutils.legacymgnltasks.MgnlTasksModuleVersionHandler</versionHandler>
   <version>${project.version}</version>
   <dependencies>
     <dependency>
       <name>core</name>
       <version>4.5.11/4.5.99</version>
     </dependency>
-    <dependency>
-      <name>mgnlutils</name>
-      <version>5.0.10/*</version>
-    </dependency>
   </dependencies>
 </module>
\ No newline at end of file

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AddPermissionTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,144 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.core.Path;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Sets or add permissions on a repository:path for a given role.
+ * @author fgiust
+ * @version $Id$
+ */
+public class AddPermissionTask extends AbstractRepositoryTask implements Task
+{
+
+    private final String role;
+
+    private final String repo;
+
+    private final String path;
+
+    private final long permission;
+
+    private Logger log = LoggerFactory.getLogger(AddPermissionTask.class);
+
+    public AddPermissionTask(String role, String repo, String path, long permission)
+    {
+        super("Setup permissions on " + repo + ":" + path + " for " + role, "Setup permissions on "
+            + repo
+            + ":"
+            + path
+            + " for "
+            + role);
+        this.role = role;
+        this.repo = repo;
+        this.path = path;
+        this.permission = permission;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+    {
+
+        Session hm = installContext.getJCRSession(RepositoryConstants.USER_ROLES);
+
+        Node roleNode = hm.getNode("/" + role);
+
+        setupAcl(roleNode, repo, path, permission);
+    }
+
+    /**
+     * @param role
+     * @param repository
+     * @param newpermissions
+     * @throws RepositoryException
+     * @throws AccessDeniedException
+     */
+    private void setupAcl(Node role, String repository, String path, long newpermissions) throws RepositoryException,
+        AccessDeniedException
+    {
+        Node acls = NodeUtil.createPath(role, "acl_" + repository, MgnlNodeType.NT_CONTENTNODE);
+
+        Iterable<Node> children = NodeUtil.getNodes(acls, MgnlNodeType.NT_CONTENTNODE);
+
+        boolean found = false;
+        for (Node acl : children)
+        {
+            if (!acl.hasProperty("path"))
+            {
+                continue;
+            }
+
+            String aclPath = acl.getProperty("path").getString();
+            if (path.equals(aclPath))
+            {
+                found = true;
+
+                long permissions = acl.getProperty("permissions").getLong();
+                if (permissions != newpermissions)
+                {
+                    setPermission(acl, path, newpermissions);
+                }
+            }
+        }
+        if (!found)
+        {
+            Node acl = NodeUtil.createPath(
+                acls,
+                Path.getUniqueLabel(acls.getSession(), NodeUtil.getPathIfPossible(acls), "0"),
+                MgnlNodeType.NT_CONTENTNODE);
+            setPermission(acl, path, newpermissions);
+        }
+    }
+
+    /**
+     * @param acl
+     * @param newpermissions
+     * @throws RepositoryException
+     * @throws AccessDeniedException
+     */
+    private void setPermission(Node acl, String path, long newpermissions) throws RepositoryException,
+        AccessDeniedException
+    {
+        log.info("Setting permissions for {} to {}", this.repo + ":" + path, this.role);
+        acl.setProperty("path", path);
+        acl.setProperty("permissions", newpermissions);
+    }
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/AnonymousUserSetupTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,129 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.cms.security.Permission;
+import info.magnolia.cms.security.UserManager;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A task that can be used to add or remove read only access to the anonymous user (for an easy admin/public switch).
+ * @author fgiust
+ * @version $Id$
+ */
+public class AnonymousUserSetupTask extends AbstractRepositoryTask implements Task
+{
+
+    private boolean allowAccess;
+
+    private Logger log = LoggerFactory.getLogger(AnonymousUserSetupTask.class);
+
+    /**
+     * @param allowAccess true to add access to anonymous users, false to remove it
+     */
+    public AnonymousUserSetupTask(boolean allowAccess)
+    {
+        super("Setup anonymous user", allowAccess
+            ? "Adding access to anonymous user"
+            : "Removing access to anonymous user");
+        this.allowAccess = allowAccess;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+    {
+
+        Session hm = installContext.getJCRSession(RepositoryConstants.USER_ROLES);
+
+        Node role = hm.getNode("/" + UserManager.ANONYMOUS_USER);
+
+        setupAcl(role, "website", "/*", this.allowAccess ? Permission.READ : Permission.NONE);
+        setupAcl(role, "uri", "/*", this.allowAccess ? Permission.ALL : Permission.NONE);
+        setupAcl(role, "uri", "/.magnolia*", Permission.NONE);
+    }
+
+    /**
+     * @param role
+     * @param repository
+     * @param newpermissions
+     * @throws RepositoryException
+     * @throws AccessDeniedException
+     */
+    private void setupAcl(Node role, String repository, String path, long newpermissions) throws RepositoryException,
+        AccessDeniedException
+    {
+        Node acls = NodeUtil.createPath(role, "acl_" + repository, MgnlNodeType.NT_CONTENTNODE);
+
+        Iterable<Node> children = NodeUtil.getNodes(acls, MgnlNodeType.NT_CONTENTNODE);
+
+        boolean found = false;
+        for (Node acl : children)
+        {
+            if (!acl.hasProperty("path"))
+            {
+                continue;
+            }
+
+            String aclPath = acl.getProperty("path").getString();
+            if (path.equals(aclPath))
+            {
+                found = true;
+
+                long permissions = acl.getProperty("permissions").getLong();
+                if (permissions != newpermissions)
+                {
+                    acl.setProperty("permissions", newpermissions);
+                }
+            }
+        }
+
+        if (!found && StringUtils.equals(path, "/*"))
+        {
+            // handle a change in URI ACLs, previously set to "/*", then to "*"
+            setupAcl(role, repository, "*", newpermissions);
+        }
+
+        if (!found)
+        {
+            log.warn("Security not configured on anonymous user! No acl for {} found on {}", path, repository);
+        }
+
+    }
+
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BaseCheckMissingTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,157 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.MetaDataUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.query.InvalidQueryException;
+
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * An abstract task that check for invalid templates/paragraphs. Should not be used directly, see
+ * {@link CheckMissingTemplatesTask} and {@link CheckMissingParagraphsTask} instead.
+ * @author fgiust
+ * @version $Id$
+ */
+public abstract class BaseCheckMissingTask extends AbstractRepositoryTask
+{
+
+    private final String templateOrParagraph;
+
+    private final String nodetype;
+
+    private Logger log = LoggerFactory.getLogger(BaseCheckMissingTask.class);
+
+    /**
+     * @param templateOrParagraph "template" or "paragraph"
+     * @param nodetype node type foc checked nodes
+     */
+    public BaseCheckMissingTask(String templateOrParagraph, String nodetype)
+    {
+        super("Check " + templateOrParagraph + "s task", "Checking pages configured with missing "
+            + templateOrParagraph
+            + "s");
+        this.templateOrParagraph = templateOrParagraph;
+        this.nodetype = nodetype;
+
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+    {
+
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(RepositoryConstants.CONFIG)
+            .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENTNODE))
+            .addOrder(Order.desc("@jcr:score"));
+
+        if (StringUtils.equals(templateOrParagraph, "template"))
+        {
+            criteria.setBasePath("//modules/*/templates/pages/*");
+        }
+        else
+        {
+            criteria.setBasePath("//modules/*/templates/components/*");
+        }
+
+        AdvancedResult result = criteria.execute();
+
+        List<String> templ = new ArrayList<String>();
+
+        for (AdvancedResultItem template : result.getItems())
+        {
+            templ.add(template.getName());
+        }
+
+        checkInvalidPages(installContext, templ);
+
+    }
+
+    /**
+     * @param installContext
+     * @param templates
+     * @throws RepositoryException
+     * @throws InvalidQueryException
+     */
+    @SuppressWarnings("unchecked")
+    private void checkInvalidPages(InstallContext installContext, List<String> templates) throws RepositoryException,
+        InvalidQueryException
+    {
+
+        Criteria criteria = JCRCriteriaFactory
+            .createCriteria()
+            .setWorkspace(RepositoryConstants.WEBSITE)
+            .add(Restrictions.eq("@jcr:primaryType", nodetype))
+            .add(Restrictions.not(Restrictions.in("MetaData/mgnl:template", templates)))
+            .addOrder(Order.desc("@jcr:score"));
+
+        log.debug("Running query: {}", criteria.toXpathExpression());
+
+        AdvancedResult result = criteria.execute();
+
+        int count = 0;
+        StringBuilder sb = new StringBuilder();
+
+        for (Node page : result.getItems())
+        {
+            String template = MetaDataUtil.getTemplate(page);
+
+            if (StringUtils.isNotEmpty(template))
+            {
+                count++;
+                sb.append(page.getPath());
+                sb.append("   ");
+                sb.append(template);
+                sb.append("\n");
+            }
+        }
+
+        if (count > 0)
+        {
+            log.error("Found {} pages with invalid " + templateOrParagraph + "s:\n{}", count, sb.toString());
+        }
+    }
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/BootstrapMissingNodesTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,98 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.BootstrapResourcesTask;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Bootstrap all the files in a single directory, only if nodes are not already existing in the repository. The folder
+ * must be available in the classpath into the "mgnl-bootstrap" directory.
+ * @author fgiust
+ * @version $Id$
+ */
+public class BootstrapMissingNodesTask extends BootstrapResourcesTask
+{
+
+    private String folderName;
+
+    private Logger log = LoggerFactory.getLogger(BootstrapMissingNodesTask.class);
+
+    /**
+     * Bootstrap all the files included in the /mgnl-bootstrap/(folder) directory, only if the nodes are not already
+     * existing.
+     * @param folder
+     */
+    public BootstrapMissingNodesTask(String folder)
+    {
+        super("Loading new content", "Bootstrap of new configuration in " + folder);
+
+        this.folderName = folder;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean acceptResource(InstallContext installContext, String name)
+    {
+        boolean accept = name.startsWith("/mgnl-bootstrap/" + folderName + "/") && name.endsWith(".xml");
+
+        if (accept)
+        {
+            String handle = StringUtils.substringBetween(name, "/mgnl-bootstrap/" + folderName + "/", ".xml");
+
+            String workspace = StringUtils.substringBefore(handle, ".");
+            handle = StringUtils.replace(StringUtils.substringAfter(handle, "."), ".", "/");
+
+            try
+            {
+                Session session = installContext.getJCRSession(workspace);
+
+                // handle is a relative path
+                boolean alreadyExisting = session.getRootNode().hasNode(handle);
+
+                if (!alreadyExisting)
+                {
+                    log.info("Loading {} since no content at {}:{} has been found", new Object[]{
+                        name,
+                        workspace,
+                        "/" + handle });
+                }
+                return !alreadyExisting;
+            }
+            catch (RepositoryException e)
+            {
+                log.debug(e.getMessage(), e);
+            }
+
+        }
+        return false;
+    }
+
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeDefaultPasswordTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,89 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A task that changes the password of an user if the current password is the default one. Useful to forbide
+ * superuser/superuser accounts on a live instance ;)
+ * @author fgiust
+ * @version $Id$
+ */
+public class ChangeDefaultPasswordTask extends AbstractRepositoryTask implements Task
+{
+
+    private String user;
+
+    private String defaultPassword;
+
+    private String newpassword;
+
+    /**
+     * Logger.
+     */
+    private Logger log = LoggerFactory.getLogger(ChangeDefaultPasswordTask.class);
+
+    /**
+     * @param user User path (e.g. /system/superuser)
+     * @param defaultPassword default password
+     * @param newpassword new password, will be set only if the current password matches the default one
+     */
+    public ChangeDefaultPasswordTask(String user, String defaultPassword, String newpassword)
+    {
+        super("Default password check", "Checking default password for " + user);
+        this.user = user;
+        this.defaultPassword = defaultPassword;
+        this.newpassword = newpassword;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+    {
+
+        Session hm = installContext.getJCRSession(RepositoryConstants.USERS);
+
+        Node role = hm.getNode(user);
+
+        String actualPassword = PropertyUtil.getString(role, "pswd");
+        if (StringUtils.equals(defaultPassword, StringUtils.trim(actualPassword)))
+        {
+            log.info("Found default password for {}, setting new password", user);
+            role.setProperty("pswd", newpassword);
+        }
+    }
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangeExistingPropertyTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,94 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.cms.core.MgnlNodeType;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * Change a nodedata value only if the previous value matches the expected one
+ * @author fgiust
+ * @version $Id$
+ */
+public class ChangeExistingPropertyTask extends AbstractRepositoryTask
+{
+
+    private final String workspaceName;
+
+    private final String nodePath;
+
+    private final String propertyName;
+
+    private final Object newPropertyValue;
+
+    private final Object previousPropertyValue;
+
+    public ChangeExistingPropertyTask(
+        String workspaceName,
+        String nodePath,
+        String propertyName,
+        Object previousPropertyValue,
+        Object newPropertyValue)
+    {
+        super("Checking the value of " + nodePath + "/" + propertyName, "Creating property "
+            + nodePath
+            + "/"
+            + propertyName
+            + " and setting its value to "
+            + newPropertyValue
+            + " if the previous value is "
+            + previousPropertyValue);
+        this.workspaceName = workspaceName;
+        this.nodePath = nodePath;
+        this.propertyName = propertyName;
+        this.previousPropertyValue = previousPropertyValue;
+        this.newPropertyValue = newPropertyValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
+    {
+        Session session = ctx.getJCRSession(workspaceName);
+
+        Node node = NodeUtil.createPath(session.getRootNode(), nodePath, MgnlNodeType.NT_CONTENT);
+
+        if (node.hasProperty(propertyName)
+            && !StringUtils.equals(node.getProperty(propertyName).getString(), newPropertyValue.toString()))
+        {
+            PropertyUtil.setProperty(node, propertyName, newPropertyValue);
+        }
+
+    }
+
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/ChangePropertyForEachChildrenTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,103 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.TaskExecutionException;
+import it.openutils.mgnlutils.util.NodeUtilsExt;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Change a nodedata value for all the children of a given node.
+ * @author fgiust
+ * @version $Id$
+ */
+public class ChangePropertyForEachChildrenTask extends AbstractRepositoryTask
+{
+
+    private final String workspaceName;
+
+    private final String nodePath;
+
+    private final String propertyName;
+
+    private final Object newPropertyValue;
+
+    private final Object previousPropertyValue;
+
+    private Logger log = LoggerFactory.getLogger(ChangePropertyForEachChildrenTask.class);
+
+    public ChangePropertyForEachChildrenTask(
+        String workspaceName,
+        String nodePath,
+        String propertyName,
+        Object previousPropertyValue,
+        Object newPropertyValue)
+    {
+        super("Checking the value of " + nodePath + "/*/" + propertyName, "Creating property "
+            + nodePath
+            + "/*/"
+            + propertyName
+            + " and setting its value to "
+            + newPropertyValue
+            + " if the previous value is "
+            + previousPropertyValue);
+        this.workspaceName = workspaceName;
+        this.nodePath = nodePath;
+        this.propertyName = propertyName;
+        this.previousPropertyValue = previousPropertyValue;
+        this.newPropertyValue = newPropertyValue;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext ctx) throws RepositoryException, TaskExecutionException
+    {
+        Session hm = ctx.getJCRSession(workspaceName);
+
+        Node parentnode = NodeUtilsExt.getNodeIfExists(hm, nodePath);
+        if (parentnode == null)
+        {
+            log.info("Node {} not found, nothing to do", nodePath);
+            return;
+        }
+
+        Iterable<Node> children = NodeUtil.getNodes(parentnode, NodeUtil.EXCLUDE_META_DATA_FILTER);
+
+        for (Node node : children)
+        {
+
+            NodeUtilsExt.setPropertyIfDifferentFromValue(node, propertyName, newPropertyValue, previousPropertyValue);
+
+        }
+    }
+
+}

Copied: magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java (from rev 4460, magnoliamodules/trunk/openutils-mgnltasks/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java)
===================================================================
--- magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java	                        (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlutils/src/main/java/it/openutils/mgnltasks/CheckAndCreateGroupTask.java	2013-12-08 16:44:17 UTC (rev 4467)
@@ -0,0 +1,78 @@
+/**
+ *
+ * Generic utilities for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlutils.html)
+ * Copyright(C) 2009-2012, 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 it.openutils.mgnltasks;
+
+import info.magnolia.module.InstallContext;
+import info.magnolia.module.delta.AbstractRepositoryTask;
+import info.magnolia.module.delta.BootstrapSingleResource;
+import info.magnolia.module.delta.Task;
+import info.magnolia.module.delta.TaskExecutionException;
+import info.magnolia.repository.RepositoryConstants;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+
+/**
+ * Creates a group if not already existing.
+ * @author fgiust
+ * @version $Id$
+ */
+public class CheckAndCreateGroupTask extends AbstractRepositoryTask implements Task
+{
+
+    private String group;
+
+    private String bootstrapFile;
+
+    /**
+     * @param group group name
+     * @param bootstrapFile bootstrap file used to create the group
+     */
+    public CheckAndCreateGroupTask(String group, String bootstrapFile)
+    {
+        super("Checking " + group, "Checking " + group);
+        this.group = group;
+        this.bootstrapFile = bootstrapFile;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void doExecute(InstallContext installContext) throws RepositoryException, TaskExecutionException
+    {
+
+        Session session = installContext.getJCRSession(RepositoryConstants.USER_GROUPS);
+
+        try
+        {
+            session.getRootNode().getNode(group);
+        }
+        catch (PathNotFoundException e)
+        {
+
+            BootstrapSingle...
 
[truncated message content]

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

From: <fg...@us...> - 2013-12-08 13:12:45

Revision: 4466
          http://openutils.svn.sourceforge.net/openutils/?rev=4466&view=rev
Author:   fgiust
Date:     2013-12-08 13:12:40 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
displays youtube video using the youtube embedded player

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

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-12-08 12:51:18 UTC (rev 4465)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2013-12-08 13:12:40 UTC (rev 4466)
@@ -565,7 +565,14 @@
              [#if !url?contains('://') ]
               [#assign url = "${this.request.contextPath}${media.previewUrl}"]
              [/#if]
-            <a id="mb${index}" class="multibox" href="${url}">
+             
+             [#if url?contains('http://youtu.be/') ]
+              [#assign url = "http://www.youtube.com/embed/${url?substring(16)}"]
+              
+              [#-- hack for using youtube embed while keeping the correct url for jwplayer - from http://youtu.be/zwXDHSrNFbQ to http://www.youtube.com/embed/zwXDHSrNFbQ --]
+              
+             [/#if]
+            <a id="mb${index}" class="multibox" href="${url}"  >
               [#assign thumbnailPath = media.thumbnailUrl]
               [#if thumbnailPath == '']
                 [#assign thumbnailPath = "/.resources/media/icons/thumb-broken.png"]

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

Flat | Threaded

<< < 1 .. 5 6 7 8 9 .. 227 > >> (Page 7 of 227)